version 1.149.2.1, 2018/03/29 20:10:47
|
version 1.149.2.4, 2020/05/02 21:28:08
|
Line 62 my %randomorder; # maps to order content
|
Line 62 my %randomorder; # maps to order content
|
my %randomizationcode; # code used to grade folder for bubblesheet exam |
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 240 sub loadmap {
|
Line 242 sub loadmap {
|
|
|
my @map_ids; |
my @map_ids; |
my $codechecked; |
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'); |
|
|
Line 249 sub loadmap {
|
Line 253 sub loadmap {
|
my $resource_id = &parse_resource($token,$lpc,$ispage,$uri,$courseid); |
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) { |
unless ($codechecked) { |
my $startsymb = |
my $startsymb = |
&Apache::lonnet::encode_symb($hash{'map_id_'.$lpc},$resource_id, |
&Apache::lonnet::encode_symb($hash{'map_id_'.$lpc},$resource_id, |
Line 278 sub loadmap {
|
Line 289 sub loadmap {
|
} |
} |
undef($codechecked); |
undef($codechecked); |
|
|
|
|
# Handle randomization and random selection |
# Handle randomization and random selection |
|
|
if ($randomize) { |
if ($randomize) { |
my $advanced; |
unless (&is_advanced($courseid)) { |
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'} = ''; |
|
} |
|
unless ($advanced) { |
|
# Order of resources is not randomized if user has and advanced role in the course. |
# Order of resources is not randomized if user has and advanced role in the course. |
my $seed; |
my $seed; |
|
|
Line 338 sub loadmap {
|
Line 340 sub loadmap {
|
@map_ids=&Math::Random::random_permutation(@map_ids); |
@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; |
Line 363 sub loadmap {
|
Line 364 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. Thes provide mnemonic |
# last parse out the mapalias params. These provide mnemonic |
# tags to resources that can be used in conditions |
# tags to resources that can be used in conditions |
|
|
while (my $token = $parser->get_token) { |
while (my $token = $parser->get_token) { |
Line 374 sub loadmap {
|
Line 375 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; |
|
} |
|
|
# -------------------------------------------------------------------- Resource |
# -------------------------------------------------------------------- Resource |
# |
# |
Line 460 sub parse_resource {
|
Line 473 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 550 sub parse_resource {
|
Line 567 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,$courseid); |
if ((!$hiddenurl{$rid}) || (&is_advanced($courseid))) { |
|
&loadmap($turi,$rid,$courseid); |
|
} |
} |
} |
return $token->[2]->{'id'}; |
return $token->[2]->{'id'}; |
} |
} |
Line 706 sub parse_condition {
|
Line 725 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 1114 sub hiddenurls {
|
Line 1133 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 1126 sub hiddenurls {
|
Line 1153 sub hiddenurls {
|
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 1136 sub hiddenurls {
|
Line 1171 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 { |
Line 1156 sub readmap {
|
Line 1217 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. |
# |
# |
Line 1176 sub readmap {
|
Line 1237 sub readmap {
|
undef %randompick; |
undef %randompick; |
undef %randompickseed; |
undef %randompickseed; |
undef %randomorder; |
undef %randomorder; |
|
undef %randomizationcode; |
undef %hiddenurl; |
undef %hiddenurl; |
undef %encurl; |
undef %encurl; |
|
undef %rescount; |
|
undef %mapcount; |
$retfrid=''; |
$retfrid=''; |
$errtext=''; |
$errtext=''; |
my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags. |
my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags. |
Line 1321 sub readmap {
|
Line 1385 sub readmap {
|
undef %randompick; |
undef %randompick; |
undef %randompickseed; |
undef %randompickseed; |
undef %randomorder; |
undef %randomorder; |
|
undef %randomizationcode; |
undef %hiddenurl; |
undef %hiddenurl; |
undef %encurl; |
undef %encurl; |
|
undef %rescount; |
|
undef %mapcount; |
$errtext=''; |
$errtext=''; |
$retfrid=''; |
$retfrid=''; |
# |
# |
Line 1441 sub build_tmp_hashes {
|
Line 1508 sub build_tmp_hashes {
|
&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 1472 sub build_tmp_hashes {
|
Line 1540 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 1509 sub evalstate {
|
Line 1577 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); |
} |
} |