|
version 1.6, 2011/11/29 11:50:53
|
version 1.12, 2013/07/19 18:24:13
|
|
Line 295 sub process_versions {
|
Line 295 sub process_versions {
|
| # |
# |
| sub versionerror { |
sub versionerror { |
| my ($uri, $used, $unused) = @_; |
my ($uri, $used, $unused) = @_; |
| my ($uri,$usedversion,$unusedversion)=@_; |
|
| return '<br />'. |
return '<br />'. |
| &mt('Version discrepancy: resource [_1] included in both version [_2] and version [_3]. Using version [_2].', |
&mt('Version discrepancy: resource [_1] included in both version [_2] and version [_3]. Using version [_2].', |
| $uri,$used,$unused).'<br />'; |
$uri,$used,$unused).'<br />'; |
|
Line 618 sub traceroute {
|
Line 617 sub traceroute {
|
| my $hidden=&Apache::lonnet::EXT('resource.0.hiddenresource',$symb); |
my $hidden=&Apache::lonnet::EXT('resource.0.hiddenresource',$symb); |
| |
|
| if ($hdnflag || lc($hidden) eq 'yes') { |
if ($hdnflag || lc($hidden) eq 'yes') { |
| $hiddenurl{$rid}=1; |
my $ignorehidden; |
| |
if (defined($hash->{'is_map_'.$rid})) { |
| |
if (($hash->{'context.nohideurl'}) && ($hash->{'context.nohideurl'} eq $hash->{'src_'.$rid})) { |
| |
$ignorehidden = 1; # Hidden parameter explicitly deleted |
| |
# if printing/grading bubblesheet exam |
| |
} |
| |
} |
| |
unless ($ignorehidden) { |
| |
$hiddenurl{$rid}=1; |
| |
} |
| } |
} |
| if (!$hdnflag && lc($hidden) eq 'no') { |
if (!$hdnflag && lc($hidden) eq 'no') { |
| delete($hiddenurl{$rid}); |
delete($hiddenurl{$rid}); |
|
Line 673 sub traceroute {
|
Line 681 sub traceroute {
|
| $further=simplify('('.'_'.$rid.')&('. |
$further=simplify('('.'_'.$rid.')&('. |
| $hash->{'condid_'.$hash->{'undercond_'.$id}}.')'); |
$hash->{'condid_'.$hash->{'undercond_'.$id}}.')'); |
| } else { |
} else { |
| my $errtext.=&mt('<br />Undefined condition ID: [_1]',$hash->{'undercond_'.$id}); |
my $errtext.='<br />'.&mt('Undefined condition ID: [_1]',$hash->{'undercond_'.$id}); |
| throw Error::Simple($errtext); |
throw Error::Simple($errtext); |
| } |
} |
| } |
} |
|
Line 783 sub parse_param {
|
Line 791 sub parse_param {
|
| $hiddenurl{$referid}=1; |
$hiddenurl{$referid}=1; |
| } |
} |
| } |
} |
| |
|
| } |
} |
| |
|
| |
|
|
Line 801 sub parse_param {
|
Line 808 sub parse_param {
|
| # $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. |
| |
# $code - CODE for which resource is being parsed (CODEd assignments). |
| # $hash - Reference to the hash we are building. |
# $hash - Reference to the hash we are building. |
| # |
# |
| # Returns: |
# Returns: |
|
Line 823 sub parse_param {
|
Line 831 sub parse_param {
|
| # |
# |
| |
|
| sub parse_resource { |
sub parse_resource { |
| my ($token,$lpc,$ispage,$uri, $hash) = @_; |
my ($token,$lpc,$ispage,$uri,$code,$hash) = @_; |
| |
|
| # 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 970 sub parse_resource {
|
Line 978 sub parse_resource {
|
| if (($turi=~/\.sequence$/) || |
if (($turi=~/\.sequence$/) || |
| ($turi=~/\.page$/)) { |
($turi=~/\.page$/)) { |
| $hash->{'is_map_'.$rid}='1'; # String in lonuserstate. |
$hash->{'is_map_'.$rid}='1'; # String in lonuserstate. |
| &read_map($turi,$rid, $hash); |
if ($hiddenurl{$rid}) { |
| |
if (($hash->{'context.nohideurl'}) && |
| |
($hash->{'context.nohideurl'} eq $hash->{'src_'.$rid})) { |
| |
delete($hiddenurl{$rid}); # Hidden parameter explicitly deleted |
| |
# if printing/grading bubblesheet exam |
| |
} |
| |
} |
| |
|
| |
&read_map($turi,$rid,$code,$hash); |
| } |
} |
| return $token->[2]->{'id'}; |
return $token->[2]->{'id'}; |
| } |
} |
|
Line 1178 sub parse_mapalias_param {
|
Line 1194 sub parse_mapalias_param {
|
| # $parent_rid - map number qualified id of the parent of the map being read. |
# $parent_rid - map number qualified id of the parent of the map being read. |
| # For the top level course map this is 0.0. For the first nested |
# For the top level course map this is 0.0. For the first nested |
| # map 1.n where n is the id of the resource within the |
# map 1.n where n is the id of the resource within the |
| # top level map and so on. |
# top level map and so on. |
| |
# $code - CODE for which map is being read (CODEd assignments). |
| # $hash - Reference to a hash that will become the big hash for the course |
# $hash - Reference to a hash that will become the big hash for the course |
| # This hash is modified as per the map description. |
# This hash is modified as per the map description. |
| # Side-effects: |
# Side-effects: |
|
Line 1188 sub parse_mapalias_param {
|
Line 1205 sub parse_mapalias_param {
|
| # |
# |
| # |
# |
| sub read_map { |
sub read_map { |
| my ($uri, $parent_rid, $hash) = @_; |
my ($uri, $parent_rid, $code, $hash) = @_; |
| |
|
| |
|
| # Check for duplication: A map may only be included once. |
# Check for duplication: A map may only be included once. |
|
Line 1235 sub read_map {
|
Line 1252 sub read_map {
|
| my $ispage = ($filename =~/\.page$/); |
my $ispage = ($filename =~/\.page$/); |
| unless ($ispage || ($filename =~ /\.sequence$/)) { |
unless ($ispage || ($filename =~ /\.sequence$/)) { |
| &Apache::lonnet::logthis("invalid: $filename : $uri"); |
&Apache::lonnet::logthis("invalid: $filename : $uri"); |
| throw Error::Simple(&mt("<br />Invalid map: <tt>[_1]</tt>", $filename)); |
throw Error::Simple('<br />'.&mt('Invalid map: [_1]','<span class="LC_filename">'.$filename.'</span>')); |
| } |
} |
| |
|
| $filename =~ /\.(\w+)$/; |
$filename =~ /\.(\w+)$/; |
|
Line 1246 sub read_map {
|
Line 1263 sub read_map {
|
| |
|
| my $contents = &Apache::lonnet::getfile($filename); |
my $contents = &Apache::lonnet::getfile($filename); |
| if($contents eq -1) { |
if($contents eq -1) { |
| throw Error::Simple(&mt('<br />Map not loaded: The file <tt>[_1]</tt> does not exist.', |
throw Error::Simple('<br />'.&mt('Map not loaded: The file [_1] does not exist.', |
| $filename)); |
'<span class="LC_filename">'.$filename.'</span>')); |
| } |
} |
| # Now that we succesfully retrieved the file we can make our parsing passes over it: |
# Now that we succesfully retrieved the file we can make our parsing passes over it: |
| # parsing is done in passes: |
# parsing is done in passes: |
|
Line 1289 sub read_map {
|
Line 1306 sub read_map {
|
| # Resource |
# Resource |
| |
|
| if ($token->[1] eq 'resource') { |
if ($token->[1] eq 'resource') { |
| my $resource_id = &parse_resource($token,$lmap_no,$ispage,$uri, $hash); |
my $resource_id = &parse_resource($token,$lmap_no,$ispage,$uri,$code,$hash); |
| if (defined $resource_id) { |
if (defined $resource_id) { |
| push(@map_ids, $resource_id); |
push(@map_ids, $resource_id); |
| } |
} |
|
Line 1313 sub read_map {
|
Line 1330 sub read_map {
|
| # |
# |
| |
|
| if ($randomize) { |
if ($randomize) { |
| if (!&has_advanced_role($username, $userdomain) ) { |
if (!&has_advanced_role($username, $userdomain) || $code) { |
| my $seed; |
my $seed; |
| |
|
| # In the advanced role, the map's random seed |
# In the advanced role, the map's random seed |
|
Line 1397 sub read_map {
|
Line 1414 sub read_map {
|
| # $cdom - Domain in which the course is evaluated. |
# $cdom - Domain in which the course is evaluated. |
| # $uname - Name of the user for whom the course is being read |
# $uname - Name of the user for whom the course is being read |
| # $udom - Name of the domain of the user for whom the course is being read. |
# $udom - Name of the domain of the user for whom the course is being read. |
| |
# $code - CODE for which course is being read (CODEd assignments) |
| |
# $nohideurl - URL for an exam folder for which hidden state is to be ignored. |
| # $target_hash- Reference to the target hash into which all of this is read. |
# $target_hash- Reference to the target hash into which all of this is read. |
| # Note tht some of the hash entries we need to build require knowledge of the |
# Note tht some of the hash entries we need to build require knowledge of the |
| # course URI.. these are expected to be filled in by the caller. |
# course URI.. these are expected to be filled in by the caller. |
|
Line 1405 sub read_map {
|
Line 1424 sub read_map {
|
| # |
# |
| # |
# |
| sub loadmap { |
sub loadmap { |
| my ($cnum, $cdom, $uname, $udom, $target_hash) = @_; |
my ($cnum, $cdom, $uname, $udom, $code, $nohideurl, $target_hash) = @_; |
| |
|
| |
|
| |
|
| # Clear the auxillary hashes and the cond array. |
# Clear the auxiliary hashes and the cond array. |
| |
|
| |
|
| %randompick = (); |
%randompick = (); |
|
Line 1423 sub loadmap {
|
Line 1442 sub loadmap {
|
| $userdomain = ''; |
$userdomain = ''; |
| %mapalias_cache = (); |
%mapalias_cache = (); |
| %cenv = (); |
%cenv = (); |
| |
$map_number = 0; |
| |
|
| # |
# |
| |
|
|
Line 1443 sub loadmap {
|
Line 1462 sub loadmap {
|
| {'freshen_cache' => 1, |
{'freshen_cache' => 1, |
| 'user' => $uname}); |
'user' => $uname}); |
| |
|
| unless ($cenv{'url'}) { |
unless ($cenv{'url'}) { |
| &Apache::lonnet::logthis("lonmap::loadmap failed: $cnum/$cdom - did not get url"); |
&Apache::lonnet::logthis("lonmap::loadmap failed: $cnum/$cdom - did not get url"); |
| return; |
return; |
| } |
} |
|
Line 1475 sub loadmap {
|
Line 1494 sub loadmap {
|
| $target_hash->{'context.username'} = $username; |
$target_hash->{'context.username'} = $username; |
| $target_hash->{'context.userdom'} = $userdomain; |
$target_hash->{'context.userdom'} = $userdomain; |
| $target_hash->{'context.courseid'} = $course_id; |
$target_hash->{'context.courseid'} = $course_id; |
| |
|
| |
# When grading or printing a bubblesheet exam ignore |
| |
# "hidden" parameter set in the map containing the exam folder. |
| |
$target_hash->{'context.nohideurl'} = $nohideurl; |
| |
|
| |
&read_map($course_uri, '0.0', $code, $target_hash); |
| &read_map($course_uri, '0.0', $target_hash); |
|
| |
|
| # |
|
| |
|
| if (defined($target_hash->{'map_start_'.$map_uri})) { |
if (defined($target_hash->{'map_start_'.$map_uri})) { |
| |
|
|
Line 1529 sub loadmap {
|
Line 1549 sub loadmap {
|
| |
|
| |
|
| &merge_hash($target_hash, 'randompick', \%randompick); |
&merge_hash($target_hash, 'randompick', \%randompick); |
| &merge_hash($target_hash, 'randompickseed', \%randompick); |
&merge_hash($target_hash, 'randompickseed', \%randompickseed); |
| &merge_hash($target_hash, 'randomorder', \%randomorder); |
&merge_hash($target_hash, 'randomorder', \%randomorder); |
| &merge_hash($target_hash, 'encurl', \%encurl); |
&merge_hash($target_hash, 'encurl', \%encurl); |
| &merge_hash($target_hash, 'hiddenurl', \%hiddenurl); |
&merge_hash($target_hash, 'hiddenurl', \%hiddenurl); |
|
Line 1559 Apache::lonmap - Construct a hash that r
|
Line 1579 Apache::lonmap - Construct a hash that r
|
| |
|
| =head1 SYNOPSIS |
=head1 SYNOPSIS |
| |
|
| &Apache::lonmap::loadmap($filepath, \%target_hash); |
&Apache::lonmap::loadmap($cnum, $cdom, $uname, $udom, $code, $nohideurl, \%target_hash); |
| |
|
| =head1 INTRODUCTION |
=head1 INTRODUCTION |
| |
|
| This module reads a course filename into a hash reference. It's up to the caller |
This module reads a course filename into a hash reference. It's up to the caller |
| to to things like decide the has should be tied to some external file and handle the locking |
to do things like decide that the hash should be tied to some external file and handle the |
| if this file should be shared amongst several Apache children. |
the locking if this file should be shared amongst several Apache children. |
| |
|
| =head1 SUBROUTINES |
=head1 SUBROUTINES |
| |
|
| =over |
=over |
| |
|
| =item loadmap($filepath, $targethash) |
=item loadmap($cnum, $cdom, $uname, $udom, $code, $nohideurl, $targethash) |
| |
|
| |
|
| Reads the map file into a target hash. |
Reads the top-level map file into a target hash. This is done by first parsing the |
| |
map file into local hashes and then unrolling those hashes into the big hash. |
| |
|
| =over |
=over |
| |
|
| =item $filepath - The path to the map file to read. |
=item $cnum - number of course being read. |
| |
|
| |
=item $cdom - domain in which the course is evaluated. |
| |
|
| |
=item $uname - name of the user for whom the course is being read. |
| |
|
| |
=item $udom - name of the domain of the user for whom the course is being read. |
| |
|
| |
=item $code - CODE for which course is being read (CODEd assignments). |
| |
|
| |
=item $nohideurl - URL for an exam folder for which hidden state is to be ignored. |
| |
|
| =item $targethash - A reference to hash into which the course is read. |
=item $targethash - A reference to hash into which the course is read |
| |
|
| =back |
=back |
| |
|
![[BACK]](/icons/back.gif){kind=icon}
Return to lonmap.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom