version 1.139, 2011/08/04 10:57:26
|
version 1.149.2.6, 2024/07/03 02:16:44
|
Line 42 use Safe::Hole;
|
Line 42 use Safe::Hole;
|
use Opcode; |
use Opcode; |
use Apache::lonenc; |
use Apache::lonenc; |
use Fcntl qw(:flock); |
use Fcntl qw(:flock); |
use LONCAPA; |
use LONCAPA qw(:DEFAULT :match); |
use File::Basename; |
use File::Basename; |
|
|
|
|
Line 59 my $retfurl; # first URL
|
Line 59 my $retfurl; # first URL
|
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 %randomorder; # maps to order contents randomly |
my %randomorder; # maps to order contents randomly |
|
my %randomizationcode; # code used to grade folder for bubblesheet exam |
my %encurl; # URLs in this folder are supposed to be encrypted |
my %encurl; # URLs in this folder are supposed to be encrypted |
my %hiddenurl; # this URL (or complete folder) is supposed to be hidden |
my %hiddenurl; # this URL (or complete folder) is supposed to be hidden |
|
my %rescount; # count of unhidden items in each map |
|
my %mapcount; # count of unhidden maps in each map |
|
|
# ----------------------------------- Remove version from URL and store in hash |
# ----------------------------------- Remove version from URL and store in hash |
|
|
Line 131 sub processversionfile {
|
Line 134 sub processversionfile {
|
|
|
# --------------------------------------------------------- Loads from disk |
# --------------------------------------------------------- Loads from disk |
|
|
|
|
|
# |
|
# Loads a map file. |
|
# Note that this may implicitly recurse via parse_resource if one of the resources |
|
# is itself composed. |
|
# |
|
# Parameters: |
|
# uri - URI of the map file. |
|
# parent_rid - Resource id in the map of the parent resource (0.0 for the top level map) |
|
# courseid - Course id for the course for which the map is being loaded |
|
# |
sub loadmap { |
sub loadmap { |
my ($uri,$parent_rid)=@_; |
my ($uri,$parent_rid,$courseid)=@_; |
|
|
# Is the map already included? |
# Is the map already included? |
|
|
Line 172 sub loadmap {
|
Line 186 sub loadmap {
|
# We can only nest sequences or pages. Anything else is an illegal nest. |
# We can only nest sequences or pages. Anything else is an illegal nest. |
|
|
unless (($fn=~/\.sequence$/) || $ispage) { |
unless (($fn=~/\.sequence$/) || $ispage) { |
$errtext.=&mt("<br />Invalid map: <tt>[_1]</tt>",$fn); |
$errtext.='<br />'.&mt('Invalid map: [_1]',"<tt>$fn</tt>"); |
return; |
return; |
} |
} |
|
|
Line 181 sub loadmap {
|
Line 195 sub loadmap {
|
my $instr=&Apache::lonnet::getfile($fn); |
my $instr=&Apache::lonnet::getfile($fn); |
|
|
if ($instr eq -1) { |
if ($instr eq -1) { |
$errtext.=&mt('<br />Map not loaded: The file <tt>[_1]</tt> does not exist.',$fn); |
$errtext.= '<br />' |
|
.&mt('Map not loaded: The file [_1] does not exist.', |
|
"<tt>$fn</tt>"); |
|
$hash{'map_type_'.$lpc}='none'; |
|
if (&is_advanced($courseid)) { |
|
$errtext .= &error_detail($parent_rid,$courseid,$ispage,$uri); |
|
} |
return; |
return; |
} |
} |
|
|
Line 225 sub loadmap {
|
Line 245 sub loadmap {
|
# This is handled in the next chunk of code. |
# This is handled in the next chunk of code. |
|
|
my @map_ids; |
my @map_ids; |
|
my $codechecked; |
|
$rescount{$lpc} = 0; |
|
$mapcount{$lpc} = 0; |
while (my $token = $parser->get_token) { |
while (my $token = $parser->get_token) { |
next if ($token->[0] ne 'S'); |
next if ($token->[0] ne 'S'); |
|
|
# Resource |
# Resource |
|
|
if ($token->[1] eq 'resource') { |
if ($token->[1] eq 'resource') { |
my $resource_id = &parse_resource($token,$lpc,$ispage,$uri); |
my $resource_id = &parse_resource($token,$lpc,$ispage,$uri,$courseid); |
if (defined $resource_id) { |
if (defined $resource_id) { |
push(@map_ids, $resource_id); |
push(@map_ids, $resource_id); |
|
if ($hash{'src_'.$lpc.'.'.$resource_id}) { |
|
$rescount{$lpc} ++; |
|
if (($hash{'src_'.$lpc.'.'.$resource_id}=~/\.sequence$/) || |
|
($hash{'src_'.$lpc.'.'.$resource_id}=~/\.page$/)) { |
|
$mapcount{$lpc} ++; |
|
} |
|
} |
|
unless ($codechecked) { |
|
my $startsymb = |
|
&Apache::lonnet::encode_symb($hash{'map_id_'.$lpc},$resource_id, |
|
$hash{'src_'."$lpc.$resource_id"}); |
|
my $code = |
|
&Apache::lonnet::EXT('resource.0.examcode',$startsymb,undef,undef, |
|
undef,undef,$courseid); |
|
if ($code) { |
|
$randomizationcode{$parent_rid} = $code; |
|
} |
|
$codechecked = 1; |
|
} |
} |
} |
|
|
# Link |
# Link |
Line 249 sub loadmap {
|
Line 291 sub loadmap {
|
&parse_condition($token,$lpc); |
&parse_condition($token,$lpc); |
} |
} |
} |
} |
|
undef($codechecked); |
|
|
# Handle randomization and random selection |
# Handle randomization and random selection |
|
|
if ($randomize) { |
if ($randomize) { |
if (!$env{'request.role.adv'}) { |
unless (&is_advanced($courseid)) { |
|
# Order of resources is not randomized if user has and advanced role in the course. |
my $seed; |
my $seed; |
|
|
# In the advanced role, the map's random seed |
# If the map's random seed parameter has been specified |
# parameter is used as the basis for computing the |
# it is used as the basis for computing the seed ... |
# seed ... if it has been specified: |
|
|
|
if (defined($randompickseed{$parent_rid})) { |
if (defined($randompickseed{$parent_rid})) { |
$seed = $randompickseed{$parent_rid}; |
$seed = $randompickseed{$parent_rid}; |
Line 278 sub loadmap {
|
Line 320 sub loadmap {
|
# TODO: Here for sure we need to pass along the username/domain |
# TODO: Here for sure we need to pass along the username/domain |
# so that we can impersonate users in lonprintout e.g. |
# so that we can impersonate users in lonprintout e.g. |
|
|
|
my $setcode; |
|
if (defined($randomizationcode{$parent_rid})) { |
|
if ($env{'form.CODE'} eq '') { |
|
$env{'form.CODE'} = $randomizationcode{$parent_rid}; |
|
$setcode = 1; |
|
} |
|
} |
|
|
my $rndseed=&Apache::lonnet::rndseed($seed); |
my $rndseed=&Apache::lonnet::rndseed($seed); |
&Apache::lonnet::setup_random_from_rndseed($rndseed); |
&Apache::lonnet::setup_random_from_rndseed($rndseed); |
@map_ids=&math::Random::random_permutation(@map_ids); # randomorder. |
|
} |
|
|
|
|
if ($setcode) { |
|
undef($env{'form.CODE'}); |
|
undef($setcode); |
|
} |
|
|
|
# Take the set of map ids we have decoded and permute them to a |
|
# random order based on the seed set above. All of this is |
|
# processing the randomorder parameter if it is set, not |
|
# randompick. |
|
|
|
@map_ids=&Math::Random::random_permutation(@map_ids); |
|
} |
|
|
my $from = shift(@map_ids); |
my $from = shift(@map_ids); |
my $from_rid = $lpc.'.'.$from; |
my $from_rid = $lpc.'.'.$from; |
$hash{'map_start_'.$uri} = $from_rid; |
$hash{'map_start_'.$uri} = $from_rid; |
$hash{'type_'.$from_rid}='start'; |
$hash{'type_'.$from_rid}='start'; |
|
|
# Create links to reflect this random ordering. |
# Create links to reflect the random re-ordering done above. |
# BUG? If there are conditions, this invalidates them? Then again |
# In the code to process the map XML, we did not process links or conditions |
# with randompick there's no gaurentee the resources required for the |
# if randomorder was set. This means that for an instructor to choose |
# conditinos to work will be selected into the map. |
|
# so randompick is inconsistent with a map that has conditions? |
|
|
|
while (my $to = shift(@map_ids)) { |
while (my $to = shift(@map_ids)) { |
&make_link(++$linkpc,$lpc,$to,$from); |
&make_link(++$linkpc,$lpc,$to,$from); |
Line 310 sub loadmap {
|
Line 368 sub loadmap {
|
$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. These provide mnemonic |
# refering to non-existant resources |
# tags to resources that can be used in conditions |
|
|
while (my $token = $parser->get_token) { |
while (my $token = $parser->get_token) { |
next if ($token->[0] ne 'S'); |
next if ($token->[0] ne 'S'); |
Line 321 sub loadmap {
|
Line 379 sub loadmap {
|
} |
} |
} |
} |
|
|
|
sub is_advanced { |
|
my ($courseid) = @_; |
|
my $advanced; |
|
if ($env{'request.course.id'}) { |
|
$advanced = (&Apache::lonnet::allowed('adv') eq 'F'); |
|
} else { |
|
$env{'request.course.id'} = $courseid; |
|
$advanced = (&Apache::lonnet::allowed('adv') eq 'F'); |
|
$env{'request.course.id'} = ''; |
|
} |
|
return $advanced; |
|
} |
|
|
|
sub error_detail { |
|
my ($parent_rid,$courseid,$ispage,$uri) = @_; |
|
my $errinfo; |
|
if ($courseid) { |
|
my $courseurl = &Apache::lonnet::courseid_to_courseurl($courseid); |
|
if ($parent_rid =~ /^(\d+)\.(\d+)$/) { |
|
my ($parent_pc,$parent_id) = ($1,$2); |
|
my ($parent_type,$published,$uploaded,$canedit,$role,$switchserver,$audom,$auname, |
|
$editfile,$filerole,$fileswitch,$audomfile,$aunamefile); |
|
if (($parent_pc eq '0') && ($hash{'map_id_1'} =~ m{^/res/($match_domain)/($match_username)/.+\.(sequence|page)$})) { |
|
($audomfile,$aunamefile) = ($1,$2); |
|
($editfile,$filerole,$fileswitch) = &canedit_published($audomfile,$aunamefile); |
|
$errinfo = &mt('Top level published sequence file is missing.'); |
|
} else { |
|
if ($parent_pc eq '1') { |
|
if ($hash{'map_id_1'} eq "/uploaded$courseurl/default.sequence") { |
|
$uploaded = 1; |
|
if (&Apache::lonnet::allowed('mdc',$courseid)) { |
|
$canedit = 1; |
|
} |
|
$errinfo = &mt('Map is referenced in the top level ([_1]Main Content[_2]) folder.', |
|
'<span class="LC_cusr_emph">','</span>'); |
|
} elsif ($hash{'map_id_1'} =~ m{^/res/($match_domain)/($match_username)/.+\.(sequence|page)$}) { |
|
($audom,$auname) = ($1,$2); |
|
($canedit,$role,$switchserver) = &canedit_published($audom,$auname); |
|
$published = 1; |
|
$errinfo = &mt('Map is referenced in the top level published sequence file.'); |
|
} |
|
} else { |
|
if ($hash{'map_id_'.$parent_pc} =~ m{^\Q/uploaded$courseurl/default_\E\d+\.(sequence|page)$}) { |
|
$uploaded = 1; |
|
if (&Apache::lonnet::allowed('mdc',$courseid)) { |
|
$canedit = 1; |
|
} |
|
} elsif ($hash{'map_id_'.$parent_pc} =~ m{^/res/($match_domain)/($match_username)/.+\.(sequence|page)$}) { |
|
($audom,$auname) = ($1,$2); |
|
($canedit,$role,$switchserver) = &canedit_published($audom,$auname); |
|
$published = 1; |
|
} |
|
if (exists($hash{'ids_'.$hash{'map_id_'.$parent_pc}})) { |
|
$parent_type = $hash{'map_type_'.$parent_pc}; |
|
if ($published) { |
|
$errinfo = &mt("Map is referenced in the published $parent_type file: [_1].", |
|
'<span class="LC_cusr_emph">'.$hash{'map_id_'.$parent_pc}.'</span>'); |
|
} else { |
|
my $title = $hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$parent_pc}}}; |
|
if ($title ne '') { |
|
my $mapdesc; |
|
if ($parent_type eq 'sequence') { |
|
$mapdesc = 'folder'; |
|
} else { |
|
$mapdesc = 'composite page'; |
|
} |
|
$errinfo = &mt("Map is referenced in the $mapdesc named: [_1].", |
|
'<span class="LC_cusr_emph">'.$title.'</span>'); |
|
} |
|
my @containers = split(/,/,$hash{'map_hierarchy_'.$parent_pc}); |
|
shift(@containers); |
|
my $folderpath; |
|
foreach my $id (@containers) { |
|
my $name; |
|
if ($id == 1) { |
|
$name = &mt('Main Content'); |
|
} elsif ($hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$id}}} ne '') { |
|
$name = $hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$id}}}; |
|
} |
|
if ($name ne '') { |
|
$folderpath .= $name.' » '; |
|
} |
|
} |
|
if ($title eq '') { |
|
$folderpath =~ s/\Q » \E$//; |
|
} else { |
|
$folderpath .= $title; |
|
} |
|
if ($folderpath) { |
|
$errinfo .= '<br />'.&mt('Hierarchy is: [_1]', |
|
'<span class="LC_cusr_emph">'.$folderpath.'</span>'); |
|
} |
|
} |
|
} |
|
} |
|
if ($uri =~ m{^/res/($match_domain)/($match_username)/.+\.(sequence|page)$}) { |
|
($audomfile,$aunamefile) = ($1,$2); |
|
($editfile,$filerole,$fileswitch) = &canedit_published($audomfile,$aunamefile); |
|
} |
|
} |
|
if ($errinfo) { |
|
$errinfo = '<br />'.$errinfo.'<br />'; |
|
} |
|
if ($editfile) { |
|
if ($errinfo ne '') { |
|
$errinfo .= '<br />'; |
|
} |
|
if ($canedit) { |
|
$errinfo .= &mt('One way to rectify this problem is to create and publish the missing file'); |
|
} else { |
|
$errinfo .= &mt('To rectify this problem, create and publish the missing file'); |
|
} |
|
my $fileurl = $uri; |
|
$fileurl =~s{^/res/}{/priv/}; |
|
if ($fileswitch) { |
|
my $rolename = &Apache::lonnet::plaintext($filerole); |
|
my $rolecode; |
|
if ($filerole eq 'au') { |
|
$rolecode = 'au./'.$audomfile.'/'; |
|
} else { |
|
$rolecode = $filerole.'./'.$audomfile.'/'.$aunamefile; |
|
} |
|
$errinfo .= '.<br />'.&mt('You will need to [_1]switch server[_2].', |
|
'<a href="/adm/switchserver?otherserver='.$switchserver.'&role='.$rolecode. |
|
'&origurl='.&escape($fileurl).'">','</a>'); |
|
} else { |
|
&js_escape(\$fileurl); |
|
$errinfo .= ': <a href="javascript:go('."'$fileurl'".');">'.&mt('Create the missing file').'</a>'; |
|
} |
|
} |
|
if ($canedit) { |
|
if ($errinfo ne '') { |
|
$errinfo .= '<br />'; |
|
} |
|
if ($published) { |
|
my $rolename = &Apache::lonnet::plaintext($role); |
|
my $rolecode; |
|
if ($role eq 'au') { |
|
$rolecode = 'au./'.$audom.'/'; |
|
} else { |
|
$rolecode = $role.'./'.$audom.'/'.$auname; |
|
} |
|
if ($editfile) { |
|
$errinfo .= &mt('Another way is to edit the parent map to remove the reference to the missing file'); |
|
} else { |
|
$errinfo .= &mt('To rectify this problem edit the parent map to remove the reference to the missing file'); |
|
} |
|
my $mapurl = $hash{'map_id_'.$parent_pc}; |
|
$mapurl =~s{^/res/}{/priv/}; |
|
if ($switchserver) { |
|
$errinfo .= '.<br />'. |
|
&mt('You will need to [_1]switch server[_2].', |
|
'<a href="/adm/switchserver?otherserver='.$switchserver.'&role='.$rolecode. |
|
'&origurl='.&escape($mapurl).'">','</a>'); |
|
} else { |
|
&js_escape(\$mapurl); |
|
$errinfo .= ': <a href="javascript:go('."'$mapurl'".');">'.&mt('Edit the map').'</a>'; |
|
} |
|
} elsif ($uploaded && $courseid) { |
|
my ($dest,$linktext); |
|
my $crstype = &Apache::loncommon::course_type($courseid); |
|
if ($parent_pc eq '1') { |
|
$dest = '/adm/coursedocs?folderpath='.&escape('default&Main%20Content:::::'); |
|
$linktext = &mt('Edit Folder'); |
|
} elsif ($hash{'ids_'.$hash{'map_id_'.$parent_pc}} =~ /^(\d+)\.(\d+)$/) { |
|
my ($editmap,$editidx) = ($1,$2); |
|
my $symb = &Apache::lonnet::encode_symb($hash{'map_id_'.$editmap}, |
|
$editidx,$hash{'map_id_'.$parent_pc}); |
|
$dest = '/adm/coursedocs?command=directnav&symb='.&escape($symb); |
|
if ($parent_type eq 'sequence') { |
|
$linktext = &mt('Edit Folder'); |
|
} else { |
|
$linktext = &mt('Edit Composite Page'); |
|
} |
|
} else { |
|
$dest = '/adm/coursedocs?folderpath='.&escape('default&Main%20Content:::::'); |
|
$linktext = &mt("Edit $crstype"); |
|
} |
|
if ($editfile) { |
|
$errinfo .= &mt("Another way is to use the $crstype Editor to delete the reference to the missing file"); |
|
} else { |
|
$errinfo .= &mt("To rectify this problem use the $crstype Editor to delete the reference to the missing file"); |
|
} |
|
$errinfo .= ': <a href="javascript:go('."'$dest'".');">'.$linktext.'</a>'; |
|
} |
|
$errinfo .= '<br />'; |
|
} |
|
} |
|
} |
|
return $errinfo; |
|
} |
|
|
|
sub canedit_published { |
|
my ($audom,$auname) = @_; |
|
my ($canedit,$role,$switchserver); |
|
my $now = time; |
|
if (($auname eq $env{'user.name'}) && ($audom eq $env{'user.domain'})) { |
|
if (exists($env{"user.role.au./$audom/"})) { |
|
my ($start,$end) = split(/\./,$env{"user.role.au./$audom/"}); |
|
unless (($end && $end < $now) || ($start && $start > $now)) { |
|
$canedit = 1; |
|
$role = 'au'; |
|
} |
|
} |
|
} |
|
unless ($canedit) { |
|
foreach my $possrole ('ca','aa') { |
|
if (exists($env{"user.role.$possrole./$audom/$auname"})) { |
|
my ($end,$start) = split(/\./,$env{"user.role.$possrole./$audom/$auname"}); |
|
unless (($end && $end < time) || ($start && $start > time)) { |
|
$canedit = 1; |
|
$role = $possrole; |
|
last; |
|
} |
|
} |
|
} |
|
} |
|
if ($canedit) { |
|
my $auhome = &Apache::lonnet::homeserver($auname,$audom); |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
if (($auhome ne 'no_host') && (!grep(/^\Q$auhome\E$/,@ids))) { |
|
$switchserver = $auhome; |
|
} |
|
} |
|
return ($canedit,$role,$switchserver); |
|
} |
|
|
# -------------------------------------------------------------------- Resource |
# -------------------------------------------------------------------- Resource |
# |
# |
Line 337 sub loadmap {
|
Line 621 sub loadmap {
|
# $lpc - Map nesting level (?) |
# $lpc - Map nesting level (?) |
# $ispage - True if this resource is encapsulated in a .page (assembled resourcde). |
# $ispage - True if this resource is encapsulated in a .page (assembled resourcde). |
# $uri - URI of the enclosing resource. |
# $uri - URI of the enclosing resource. |
|
# $courseid - Course id of the course containing the resource being parsed. |
# Returns: |
# Returns: |
# Value of the id attribute of the tag. |
# Value of the id attribute of the tag. |
# |
# |
Line 357 sub loadmap {
|
Line 642 sub loadmap {
|
|
|
|
|
sub parse_resource { |
sub parse_resource { |
my ($token,$lpc,$ispage,$uri) = @_; |
my ($token,$lpc,$ispage,$uri,$courseid) = @_; |
|
|
# I refuse to countenance code like this that has |
# I refuse to countenance code like this that has |
# such a dirty side effect (and forcing this sub to be called within a loop). |
# such a dirty side effect (and forcing this sub to be called within a loop). |
Line 406 sub parse_resource {
|
Line 691 sub parse_resource {
|
# is not a page. If the resource is a page then it must be |
# is not a page. If the resource is a page then it must be |
# assembled (at fetch time?). |
# assembled (at fetch time?). |
|
|
unless ($ispage) { |
if ($ispage) { |
|
if ($token->[2]->{'external'} eq 'true') { # external |
|
$turi=~s{^http\://}{/ext/}; |
|
} |
|
} else { |
$turi=~/\.(\w+)$/; |
$turi=~/\.(\w+)$/; |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
if ($token->[2]->{'external'} eq 'true') { # external |
if ($token->[2]->{'external'} eq 'true') { # external |
Line 496 sub parse_resource {
|
Line 785 sub parse_resource {
|
if (($turi=~/\.sequence$/) || |
if (($turi=~/\.sequence$/) || |
($turi=~/\.page$/)) { |
($turi=~/\.page$/)) { |
$hash{'is_map_'.$rid}=1; |
$hash{'is_map_'.$rid}=1; |
&loadmap($turi,$rid); |
if ((!$hiddenurl{$rid}) || (&is_advanced($courseid))) { |
|
&loadmap($turi,$rid,$courseid); |
|
} |
} |
} |
return $token->[2]->{'id'}; |
return $token->[2]->{'id'}; |
} |
} |
Line 652 sub parse_condition {
|
Line 943 sub parse_condition {
|
# Typical attributes: |
# Typical attributes: |
# to=n - Number of the resource the parameter applies to. |
# to=n - Number of the resource the parameter applies to. |
# type=xx - Type of parameter value (e.g. string_yesno or int_pos). |
# type=xx - Type of parameter value (e.g. string_yesno or int_pos). |
# name=xxx - Name ofr parameter (e.g. parameter_randompick or parameter_randomorder). |
# name=xxx - Name of parameter (e.g. parameter_randompick or parameter_randomorder). |
# value=xxx - value of the parameter. |
# value=xxx - value of the parameter. |
|
|
sub parse_param { |
sub parse_param { |
Line 721 sub parse_param {
|
Line 1012 sub parse_param {
|
} |
} |
} |
} |
} |
} |
|
# |
|
# Parse mapalias parameters. |
|
# these are tags of the form: |
|
# <param to="nn" |
|
# value="some-alias-for-resourceid-nn" |
|
# name="parameter_0_mapalias" |
|
# type="string" /> |
|
# A map alias is a textual name for a resource: |
|
# - The to attribute identifies the resource (this gets level qualified below) |
|
# - The value attributes provides the alias string. |
|
# - name must be of the regexp form: /^parameter_(0_)*mapalias$/ |
|
# - e.g. the string 'parameter_' followed by 0 or more "0_" strings |
|
# terminating with the string 'mapalias'. |
|
# Examples: |
|
# 'parameter_mapalias', 'parameter_0_mapalias', parameter_0_0_mapalias' |
|
# Invalid to ids are silently ignored. |
|
# |
|
# Parameters: |
|
# token - The token array fromthe HMTML::TokeParser |
|
# lpc - The current map level counter. |
|
# |
sub parse_mapalias_param { |
sub parse_mapalias_param { |
my ($token,$lpc) = @_; |
my ($token,$lpc) = @_; |
|
|
|
# Fully qualify the to value and ignore the alias if there is no |
|
# corresponding resource. |
|
|
my $referid=$lpc.'.'.$token->[2]->{'to'}; |
my $referid=$lpc.'.'.$token->[2]->{'to'}; |
return if (!exists($hash{'src_'.$referid})); |
return if (!exists($hash{'src_'.$referid})); |
|
|
|
# If this is a valid mapalias parameter, |
|
# Append the target id to the count_mapalias element for that |
|
# alias so that we can detect doubly defined aliases |
|
# e.g.: |
|
# <param to="1" value="george" name="parameter_0_mapalias" type="string" /> |
|
# <param to="2" value="george" name="parameter_0_mapalias" type="string" /> |
|
# |
|
# The example above is trivial but the case that's important has to do with |
|
# constructing a map that includes a nested map where the nested map may have |
|
# aliases that conflict with aliases established in the enclosing map. |
|
# |
|
# ...and create/update the hash mapalias entry to actually store the alias. |
|
# |
|
|
if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) { |
if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) { |
&count_mapalias($token->[2]->{'value'},$referid); |
&count_mapalias($token->[2]->{'value'},$referid); |
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
Line 735 sub parse_mapalias_param {
|
Line 1064 sub parse_mapalias_param {
|
|
|
# --------------------------------------------------------- Simplify expression |
# --------------------------------------------------------- Simplify expression |
|
|
|
|
|
# |
|
# Someone should really comment this to describe what it does to what and why. |
|
# |
sub simplify { |
sub simplify { |
my $expression=shift; |
my $expression=shift; |
# (0&1) = 1 |
# (0&1) = 1 |
Line 744 sub simplify {
|
Line 1077 sub simplify {
|
# 8&8=8 |
# 8&8=8 |
$expression=~s/([^_\.\d])([_\.\d]+)\&\2([^_\.\d])/$1$2$3/g; |
$expression=~s/([^_\.\d])([_\.\d]+)\&\2([^_\.\d])/$1$2$3/g; |
# 8|8=8 |
# 8|8=8 |
$expression=~s/([^_\.\d])([_\.\d]+)\|\2([^_\.\d])/$1$2$3/g; |
$expression=~s/([^_\.\d])([_\.\d]+)(?:\|\2)+([^_\.\d])/$1$2$3/g; |
# (5&3)&4=5&3&4 |
# (5&3)&4=5&3&4 |
$expression=~s/\(([_\.\d]+)((?:\&[_\.\d]+)+)\)\&([_\.\d]+[^_\.\d])/$1$2\&$3/g; |
$expression=~s/\(([_\.\d]+)((?:\&[_\.\d]+)+)\)\&([_\.\d]+[^_\.\d])/$1$2\&$3/g; |
# (((5&3)|(4&6)))=((5&3)|(4&6)) |
# (((5&3)|(4&6)))=((5&3)|(4&6)) |
Line 758 sub simplify {
|
Line 1091 sub simplify {
|
|
|
# -------------------------------------------------------- Build condition hash |
# -------------------------------------------------------- Build condition hash |
|
|
|
# |
|
# Traces a route recursively through the map after it has been loaded |
|
# (I believe this really visits each resourcde that is reachable fromt he |
|
# start top node. |
|
# |
|
# - Marks hidden resources as hidden. |
|
# - Marks which resource URL's must be encrypted. |
|
# - Figures out (if necessary) the first resource in the map. |
|
# - Further builds the chunks of the big hash that define how |
|
# conditions work |
|
# |
|
# Note that the tracing strategy won't visit resources that are not linked to |
|
# anything or islands in the map (groups of resources that form a path but are not |
|
# linked in to the path that can be traced from the start resource...but that's ok |
|
# because by definition, those resources are not reachable by users of the course. |
|
# |
|
# Parameters: |
|
# sofar - _URI of the prior entry or 0 if this is the top. |
|
# rid - URI of the resource to visit. |
|
# beenhere - list of resources (each resource enclosed by &'s) that have |
|
# already been visited. |
|
# encflag - If true the resource that resulted in a recursive call to us |
|
# has an encoded URL (which means contained resources should too). |
|
# hdnflag - If true,the resource that resulted in a recursive call to us |
|
# was hidden (which means contained resources should be hidden too). |
|
# Returns |
|
# new value indicating how far the map has been traversed (the sofar). |
|
# |
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=~/\&\Q$rid\E\&/) { |
unless ($beenhere=~/\&\Q$rid\E\&/) { |
$beenhere.=$rid.'&'; |
$beenhere.=$rid.'&'; |
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
Line 776 sub traceroute {
|
Line 1138 sub traceroute {
|
|
|
my $encrypt=&Apache::lonnet::EXT('resource.0.encrypturl',$symb); |
my $encrypt=&Apache::lonnet::EXT('resource.0.encrypturl',$symb); |
if ($encflag || lc($encrypt) eq 'yes') { $encurl{$rid}=1; } |
if ($encflag || lc($encrypt) eq 'yes') { $encurl{$rid}=1; } |
|
|
if (($retfrid eq '') && ($hash{'src_'.$rid}) |
if (($retfrid eq '') && ($hash{'src_'.$rid}) |
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
$retfrid=$rid; |
$retfrid=$rid; |
} |
} |
|
|
if (defined($hash{'conditions_'.$rid})) { |
if (defined($hash{'conditions_'.$rid})) { |
$hash{'conditions_'.$rid}=simplify( |
$hash{'conditions_'.$rid}=simplify( |
'('.$hash{'conditions_'.$rid}.')|('.$sofar.')'); |
'('.$hash{'conditions_'.$rid}.')|('.$sofar.')'); |
Line 789 sub traceroute {
|
Line 1153 sub traceroute {
|
|
|
# if the expression is just the 0th condition keep it |
# if the expression is just the 0th condition keep it |
# otherwise leave a pointer to this condition expression |
# otherwise leave a pointer to this condition expression |
|
|
$newsofar = ($sofar eq '0') ? $sofar : '_'.$rid; |
$newsofar = ($sofar eq '0') ? $sofar : '_'.$rid; |
|
|
|
# Recurse if the resource is a map: |
|
|
if (defined($hash{'is_map_'.$rid})) { |
if (defined($hash{'is_map_'.$rid})) { |
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) { |
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) { |
$sofar=$newsofar= |
$sofar=$newsofar= |
Line 801 sub traceroute {
|
Line 1168 sub traceroute {
|
$hdnflag || $hiddenurl{$rid}); |
$hdnflag || $hiddenurl{$rid}); |
} |
} |
} |
} |
|
|
|
# Processes links to this resource: |
|
# - verify the existence of any conditionals on the link to here. |
|
# - Recurse to any resources linked to us. |
|
# |
if (defined($hash{'to_'.$rid})) { |
if (defined($hash{'to_'.$rid})) { |
foreach my $id (split(/\,/,$hash{'to_'.$rid})) { |
foreach my $id (split(/\,/,$hash{'to_'.$rid})) { |
my $further=$sofar; |
my $further=$sofar; |
|
# |
|
# If there's a condition associated with this link be sure |
|
# it's been defined else that's an error: |
|
# |
if ($hash{'undercond_'.$id}) { |
if ($hash{'undercond_'.$id}) { |
if (defined($hash{'condid_'.$hash{'undercond_'.$id}})) { |
if (defined($hash{'condid_'.$hash{'undercond_'.$id}})) { |
$further=simplify('('.'_'.$rid.')&('. |
$further=simplify('('.'_'.$rid.')&('. |
$hash{'condid_'.$hash{'undercond_'.$id}}.')'); |
$hash{'condid_'.$hash{'undercond_'.$id}}.')'); |
} else { |
} else { |
$errtext.=&mt('<br />Undefined condition ID: [_1]',$hash{'undercond_'.$id}); |
$errtext.= '<br />'. |
|
&mt('Undefined condition ID: [_1]', |
|
$hash{'undercond_'.$id}); |
} |
} |
} |
} |
|
# Recurse to resoruces that have to's to us. |
$newsofar=&traceroute($further,$hash{'goesto_'.$id},$beenhere, |
$newsofar=&traceroute($further,$hash{'goesto_'.$id},$beenhere, |
$encflag,$hdnflag); |
$encflag,$hdnflag); |
} |
} |
Line 822 sub traceroute {
|
Line 1201 sub traceroute {
|
|
|
# ------------------------------ Cascading conditions, quick access, parameters |
# ------------------------------ Cascading conditions, quick access, parameters |
|
|
|
# |
|
# Seems a rather strangely named sub given what the comment above says it does. |
|
|
|
|
sub accinit { |
sub accinit { |
my ($uri,$short,$fn)=@_; |
my ($uri,$short,$fn)=@_; |
my %acchash=(); |
my %acchash=(); |
my %captured=(); |
my %captured=(); |
my $condcounter=0; |
my $condcounter=0; |
$acchash{'acc.cond.'.$short.'.0'}=0; |
$acchash{'acc.cond.'.$short.'.0'}=0; |
|
|
|
# This loop is only interested in conditions and |
|
# parameters in the big hash: |
|
|
foreach my $key (keys(%hash)) { |
foreach my $key (keys(%hash)) { |
|
|
|
# conditions: |
|
|
if ($key=~/^conditions/) { |
if ($key=~/^conditions/) { |
my $expr=$hash{$key}; |
my $expr=$hash{$key}; |
|
|
# try to find and factor out common sub-expressions |
# try to find and factor out common sub-expressions |
|
# Any subexpression that is found is simplified, removed from |
|
# the original condition expression and the simplified sub-expression |
|
# substituted back in to the epxression..I'm not actually convinced this |
|
# factors anything out...but instead maybe simplifies common factors(?) |
|
|
foreach my $sub ($expr=~m/(\(\([_\.\d]+(?:\&[_\.\d]+)+\)(?:\|\([_\.\d]+(?:\&[_\.\d]+)+\))+\))/g) { |
foreach my $sub ($expr=~m/(\(\([_\.\d]+(?:\&[_\.\d]+)+\)(?:\|\([_\.\d]+(?:\&[_\.\d]+)+\))+\))/g) { |
my $orig=$sub; |
my $orig=$sub; |
|
|
Line 845 sub accinit {
|
Line 1241 sub accinit {
|
$expr=~s/\Q$orig\E/$sub/; |
$expr=~s/\Q$orig\E/$sub/; |
} |
} |
$hash{$key}=$expr; |
$hash{$key}=$expr; |
|
|
|
# If not yet seen, record in acchash and that we've seen it. |
|
|
unless (defined($captured{$expr})) { |
unless (defined($captured{$expr})) { |
$condcounter++; |
$condcounter++; |
$captured{$expr}=$condcounter; |
$captured{$expr}=$condcounter; |
$acchash{'acc.cond.'.$short.'.'.$condcounter}=$expr; |
$acchash{'acc.cond.'.$short.'.'.$condcounter}=$expr; |
} |
} |
|
# Parameters: |
|
|
} elsif ($key=~/^param_(\d+)\.(\d+)/) { |
} elsif ($key=~/^param_(\d+)\.(\d+)/) { |
my $prefix=&Apache::lonnet::encode_symb($hash{'map_id_'.$1},$2, |
my $prefix=&Apache::lonnet::encode_symb($hash{'map_id_'.$1},$2, |
$hash{'src_'.$1.'.'.$2}); |
$hash{'src_'.$1.'.'.$2}); |
Line 863 sub accinit {
|
Line 1264 sub accinit {
|
} |
} |
} |
} |
} |
} |
|
# This loop only processes id entries in the big hash. |
|
|
foreach my $key (keys(%hash)) { |
foreach my $key (keys(%hash)) { |
if ($key=~/^ids/) { |
if ($key=~/^ids/) { |
foreach my $resid (split(/\,/,$hash{$key})) { |
foreach my $resid (split(/\,/,$hash{$key})) { |
Line 906 sub accinit {
|
Line 1309 sub accinit {
|
|
|
sub hiddenurls { |
sub hiddenurls { |
my $randomoutentry=''; |
my $randomoutentry=''; |
foreach my $rid (keys %randompick) { |
foreach my $rid (keys(%randompick)) { |
my $rndpick=$randompick{$rid}; |
my $rndpick=$randompick{$rid}; |
my $mpc=$hash{'map_pc_'.$hash{'src_'.$rid}}; |
my $mpc=$hash{'map_pc_'.$hash{'src_'.$rid}}; |
# ------------------------------------------- put existing resources into array |
# ------------------------------------------- put existing resources into array |
Line 927 sub hiddenurls {
|
Line 1330 sub hiddenurls {
|
# -------------------------------- randomly eliminate the ones that should stay |
# -------------------------------- randomly eliminate the ones that should stay |
my (undef,$id)=split(/\./,$rid); |
my (undef,$id)=split(/\./,$rid); |
if ($randompickseed{$rid}) { $id=$randompickseed{$rid}; } |
if ($randompickseed{$rid}) { $id=$randompickseed{$rid}; } |
|
my $setcode; |
|
if (defined($randomizationcode{$rid})) { |
|
if ($env{'form.CODE'} eq '') { |
|
$env{'form.CODE'} = $randomizationcode{$rid}; |
|
$setcode = 1; |
|
} |
|
} |
my $rndseed=&Apache::lonnet::rndseed($id); # use id instead of symb |
my $rndseed=&Apache::lonnet::rndseed($id); # use id instead of symb |
|
if ($setcode) { |
|
undef($env{'form.CODE'}); |
|
undef($setcode); |
|
} |
&Apache::lonnet::setup_random_from_rndseed($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]]=''; } |
Line 937 sub hiddenurls {
|
Line 1351 sub hiddenurls {
|
if ($currentrids[$k]) { |
if ($currentrids[$k]) { |
$hash{'randomout_'.$currentrids[$k]}=1; |
$hash{'randomout_'.$currentrids[$k]}=1; |
my ($mapid,$resid)=split(/\./,$currentrids[$k]); |
my ($mapid,$resid)=split(/\./,$currentrids[$k]); |
|
if ($rescount{$mapid}) { |
|
$rescount{$mapid} --; |
|
} |
|
if ($hash{'is_map_'.$currentrids[$k]}) { |
|
if ($mapcount{$mapid}) { |
|
$mapcount{$mapid} --; |
|
} |
|
} |
$randomoutentry.='&'. |
$randomoutentry.='&'. |
&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid}, |
&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid}, |
$resid, |
$resid, |
Line 946 sub hiddenurls {
|
Line 1368 sub hiddenurls {
|
} |
} |
} |
} |
# ------------------------------ take care of explicitly hidden urls or folders |
# ------------------------------ take care of explicitly hidden urls or folders |
foreach my $rid (keys %hiddenurl) { |
foreach my $rid (keys(%hiddenurl)) { |
$hash{'randomout_'.$rid}=1; |
$hash{'randomout_'.$rid}=1; |
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
|
if ($rescount{$mapid}) { |
|
$rescount{$mapid} --; |
|
} |
|
if ($hash{'is_map_'.$rid}) { |
|
if ($mapcount{$mapid}) { |
|
$mapcount{$mapid} --; |
|
} |
|
} |
$randomoutentry.='&'. |
$randomoutentry.='&'. |
&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid, |
&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid, |
$hash{'src_'.$rid}).'&'; |
$hash{'src_'.$rid}).'&'; |
Line 959 sub hiddenurls {
|
Line 1389 sub hiddenurls {
|
} |
} |
} |
} |
|
|
|
# -------------------------------------- populate big hash with map breadcrumbs |
|
|
|
# Create map_breadcrumbs_$pc from map_hierarchy_$pc by omitting intermediate |
|
# maps not shown in Course Contents table. |
|
|
|
sub mapcrumbs { |
|
foreach my $key (keys(%rescount)) { |
|
if ($hash{'map_hierarchy_'.$key}) { |
|
my $skipnext = 0; |
|
foreach my $id (split(/,/,$hash{'map_hierarchy_'.$key}),$key) { |
|
unless ($skipnext) { |
|
$hash{'map_breadcrumbs_'.$key} .= "$id,"; |
|
} |
|
unless (($id == 0) || ($id == 1)) { |
|
if ((!$rescount{$id}) || ($rescount{$id} == 1 && $mapcount{$id} == 1)) { |
|
$skipnext = 1; |
|
} else { |
|
$skipnext = 0; |
|
} |
|
} |
|
} |
|
$hash{'map_breadcrumbs_'.$key} =~ s/,$//; |
|
} |
|
} |
|
} |
|
|
# ---------------------------------------------------- Read map and all submaps |
# ---------------------------------------------------- Read map and all submaps |
|
|
sub readmap { |
sub readmap { |
my $short=shift; |
my ($short,$critmsg_check) = @_; |
$short=~s/^\///; |
$short=~s/^\///; |
|
|
# TODO: Hidden dependency on current user: |
# TODO: Hidden dependency on current user: |
Line 979 sub readmap {
|
Line 1435 sub readmap {
|
} |
} |
@cond=('true:normal'); |
@cond=('true:normal'); |
|
|
unless (open(LOCKFILE,">$fn.db.lock")) { |
unless (open(LOCKFILE,">","$fn.db.lock")) { |
# |
# |
# Most likely a permissions problem on the lockfile or its directory. |
# Most likely a permissions problem on the lockfile or its directory. |
# |
# |
$errtext.='<br />'.&mt('Map not loaded - Lock file could not be opened when reading map:').' <tt>'.$fn.'</tt>.'; |
|
$retfurl = ''; |
$retfurl = ''; |
return ($retfurl,$errtext); |
return ($retfurl,'<br />'.&mt('Map not loaded - Lock file could not be opened when reading map:').' <tt>'.$fn.'</tt>.'); |
} |
} |
my $lock=0; |
my $lock=0; |
my $gotstate=0; |
my $gotstate=0; |
Line 998 sub readmap {
|
Line 1453 sub readmap {
|
&unlink_tmpfiles($fn); |
&unlink_tmpfiles($fn); |
} |
} |
undef %randompick; |
undef %randompick; |
|
undef %randompickseed; |
|
undef %randomorder; |
|
undef %randomizationcode; |
undef %hiddenurl; |
undef %hiddenurl; |
undef %encurl; |
undef %encurl; |
|
undef %rescount; |
|
undef %mapcount; |
$retfrid=''; |
$retfrid=''; |
|
$errtext=''; |
my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags. |
my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags. |
|
|
# if we got the lock, regenerate course regnerate empty files and tie them. |
# if we got the lock, regenerate course regnerate empty files and tie them. |
Line 1095 sub readmap {
|
Line 1556 sub readmap {
|
# |
# |
&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, |
|
"request.course.tied" => time}); |
|
|
$untiedhash = untie(%hash); |
$untiedhash = untie(%hash); |
$untiedparmhash = untie(%parmhash); |
$untiedparmhash = untie(%parmhash); |
$gotstate = 1; |
$gotstate = 1; |
Line 1138 sub readmap {
|
Line 1601 sub readmap {
|
$lock=1; |
$lock=1; |
} |
} |
undef %randompick; |
undef %randompick; |
|
undef %randompickseed; |
|
undef %randomorder; |
|
undef %randomizationcode; |
undef %hiddenurl; |
undef %hiddenurl; |
undef %encurl; |
undef %encurl; |
|
undef %rescount; |
|
undef %mapcount; |
|
$errtext=''; |
$retfrid=''; |
$retfrid=''; |
# |
# |
# Once more through the routine of tying and loading and so on. |
# Once more through the routine of tying and loading and so on. |
Line 1186 sub readmap {
|
Line 1655 sub readmap {
|
|
|
# Depends on user must parameterize this as well..or separate as this is: |
# Depends on user must parameterize this as well..or separate as this is: |
# more part of determining what someone sees on entering a course? |
# more part of determining what someone sees on entering a course? |
|
# When lonuserstate::readmap() is called from lonroles.pm, i.e., |
|
# after selecting a role in a course, critical_redirect will be called, |
|
# unless the course has a blocking event in effect, which suppresses |
|
# critical message checking (users without evb priv). |
|
# |
|
|
my @what=&Apache::lonnet::dump('critical',$env{'user.domain'}, |
if ($critmsg_check) { |
$env{'user.name'}); |
my ($redirect,$url) = &Apache::loncommon::critical_redirect(); |
if ($what[0]) { |
if ($redirect) { |
if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) { |
$retfurl = $url; |
$retfurl='/adm/email?critical=display'; |
|
} |
} |
} |
} |
return ($retfurl,$errtext); |
return ($retfurl,$errtext); |
} |
} |
|
|
Line 1226 sub build_tmp_hashes {
|
Line 1699 sub build_tmp_hashes {
|
$pc=0; |
$pc=0; |
&clear_mapalias_count(); |
&clear_mapalias_count(); |
&processversionfile(%cenv); |
&processversionfile(%cenv); |
|
|
|
# URI Of the map file. |
|
|
my $furi=&Apache::lonnet::clutter($uri); |
my $furi=&Apache::lonnet::clutter($uri); |
# |
# |
# the map staring points. |
# the map staring points. |
Line 1234 sub build_tmp_hashes {
|
Line 1710 sub build_tmp_hashes {
|
$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; |
&loadmap($uri,'0.0'); |
|
|
# Load the map.. note that loadmap may implicitly recurse if the map contains |
|
# sub-maps. |
|
|
|
|
|
&loadmap($uri,'0.0',$short); |
|
|
|
# The code below only executes if there is a starting point for the map> |
|
# Q/BUG??? If there is no start resource for the map should that be an error? |
|
# |
|
|
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, |
|
"request.course.tied" => time}); |
$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); |
&hiddenurls(); |
&hiddenurls(); |
|
&mapcrumbs(); |
} |
} |
$errtext .= &get_mapalias_errors(); |
$errtext .= &get_mapalias_errors(); |
# ------------------------------------------------------- Put versions into src |
# ------------------------------------------------------- Put versions into src |
Line 1274 sub build_tmp_hashes {
|
Line 1762 sub build_tmp_hashes {
|
# ---------------------------------------------------- Store away initial state |
# ---------------------------------------------------- Store away initial state |
{ |
{ |
my $cfh; |
my $cfh; |
if (open($cfh,">$fn.state")) { |
if (open($cfh,">","$fn.state")) { |
print $cfh join("\n",@cond); |
print $cfh join("\n",@cond); |
$gotstate = 1; |
$gotstate = 1; |
} else { |
} else { |
Line 1289 sub unlink_tmpfiles {
|
Line 1777 sub unlink_tmpfiles {
|
my ($fn) = @_; |
my ($fn) = @_; |
my $file_dir = dirname($fn); |
my $file_dir = dirname($fn); |
|
|
if ($fn eq LONCAPA::tempdir()) { |
if ("$file_dir/" eq LONCAPA::tempdir()) { |
my @files = qw (.db _symb.db .state _parms.db); |
my @files = qw (.db _symb.db .state _parms.db); |
foreach my $file (@files) { |
foreach my $file (@files) { |
if (-e $fn.$file) { |
if (-e $fn.$file) { |
Line 1311 sub evalstate {
|
Line 1799 sub evalstate {
|
if (-e $fn) { |
if (-e $fn) { |
my @conditions=(); |
my @conditions=(); |
{ |
{ |
open(my $fh,"<$fn"); |
open(my $fh,"<",$fn); |
@conditions=<$fh>; |
@conditions=<$fh>; |
close($fh); |
close($fh); |
} |
} |
Line 1366 sub evalstate {
|
Line 1854 sub evalstate {
|
$count++; |
$count++; |
} |
} |
my ($mapid) = split(/\./,$id); |
my ($mapid) = split(/\./,$id); |
&mt('Resource "[_1]" <br /> in Map "[_2]"', |
&mt('Resource [_1][_2]in Map [_3]', |
$hash{'title_'.$id}, |
$hash{'title_'.$id},'<br />', |
$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); |