|
version 1.138, 2011/07/26 10:40:23
|
version 1.141, 2011/08/18 04:17:07
|
|
Line 70 sub versionerror {
|
Line 70 sub versionerror {
|
| $uri,$usedversion,$unusedversion).'<br />'; |
$uri,$usedversion,$unusedversion).'<br />'; |
| } |
} |
| |
|
| |
# Removes the version number from a URI and returns the resulting |
| |
# URI (e.g. mumbly.version.stuff => mumbly.stuff). |
| |
# |
| |
# If the URI has not been seen with a versio before the |
| |
# hash{'version_'.resultingURI} is set to the version number. |
| |
# If the URI has been seen and the version does not match and error |
| |
# is added to the error string. |
| |
# |
| |
# Parameters: |
| |
# URI potentially with a version. |
| |
# Returns: |
| |
# URI with the version cut out. |
| |
# See above for side effects. |
| |
# |
| |
|
| sub versiontrack { |
sub versiontrack { |
| my $uri=shift; |
my $uri=shift; |
| if ($uri=~/\.(\d+)\.\w+$/) { |
if ($uri=~/\.(\d+)\.\w+$/) { |
|
Line 116 sub processversionfile {
|
Line 131 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) |
| |
# |
| |
# |
| sub loadmap { |
sub loadmap { |
| my ($uri,$parent_rid)=@_; |
my ($uri,$parent_rid)=@_; |
| |
|
|
Line 218 sub loadmap {
|
Line 244 sub loadmap {
|
| 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); |
| if (defined $resource_id) { |
if (defined $resource_id) { |
| push(@map_ids, $resource_id); |
push(@map_ids, $resource_id); |
| } |
} |
| |
|
| # Link |
# Link |
|
Line 226 sub loadmap {
|
Line 252 sub loadmap {
|
| } elsif ($token->[1] eq 'link' && !$randomize) { |
} elsif ($token->[1] eq 'link' && !$randomize) { |
| &make_link(++$linkpc,$lpc,$token->[2]->{'to'}, |
&make_link(++$linkpc,$lpc,$token->[2]->{'to'}, |
| $token->[2]->{'from'}, |
$token->[2]->{'from'}, |
| $token->[2]->{'condition'}); |
$token->[2]->{'condition'}); # note ..condition may be undefined. |
| |
|
| # condition |
# condition |
| |
|
|
Line 241 sub loadmap {
|
Line 267 sub loadmap {
|
| if ($randomize) { |
if ($randomize) { |
| if (!$env{'request.role.adv'}) { |
if (!$env{'request.role.adv'}) { |
| my $seed; |
my $seed; |
| |
|
| |
# In the advanced role, the map's random seed |
| |
# parameter is used as the basis for computing the |
| |
# seed ... if it has been specified: |
| |
|
| if (defined($randompickseed{$parent_rid})) { |
if (defined($randompickseed{$parent_rid})) { |
| $seed = $randompickseed{$parent_rid}; |
$seed = $randompickseed{$parent_rid}; |
| } else { |
} else { |
| |
|
| |
# Otherwise the parent's fully encoded symb is used. |
| |
|
| my ($mapid,$resid)=split(/\./,$parent_rid); |
my ($mapid,$resid)=split(/\./,$parent_rid); |
| my $symb= |
my $symb= |
| &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid}, |
&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid}, |
|
Line 252 sub loadmap {
|
Line 286 sub loadmap {
|
| $seed = $symb; |
$seed = $symb; |
| } |
} |
| |
|
| # 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 $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); |
|
| |
# 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 the random re-ordering done above. |
| |
# In the code to process the map XML, we did not process links or conditions |
| |
# if randomorder was set. This means that for an instructor to choose |
| |
|
| while (my $to = shift(@map_ids)) { |
while (my $to = shift(@map_ids)) { |
| &make_link(++$linkpc,$lpc,$to,$from); |
&make_link(++$linkpc,$lpc,$to,$from); |
| my $to_rid = $lpc.'.'.$to; |
my $to_rid = $lpc.'.'.$to; |
|
Line 278 sub loadmap {
|
Line 324 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 |
|
| # refering to non-existant resources |
# last parse out the mapalias params. Thes provide mnemonic |
| |
# 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'); |
| if ($token->[1] eq 'param') { |
if ($token->[1] eq 'param') { |
|
Line 305 sub loadmap {
|
Line 353 sub loadmap {
|
| # $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. |
| # Returns: |
# Returns: |
| |
# Value of the id attribute of the tag. |
| # |
# |
| # Note: |
# Note: |
| # The token is an array that contains the following elements: |
# The token is an array that contains the following elements: |
|
Line 325 sub loadmap {
|
Line 374 sub loadmap {
|
| sub parse_resource { |
sub parse_resource { |
| my ($token,$lpc,$ispage,$uri) = @_; |
my ($token,$lpc,$ispage,$uri) = @_; |
| |
|
| # I refuse to coutenance 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). |
| # |
# |
| # if ($token->[2]->{'type'} eq 'zombie') { next; } |
# if ($token->[2]->{'type'} eq 'zombie') { next; } |
| |
# |
| |
# The original code both returns _and_ skips to the next pass of the >caller's< |
| |
# loop, that's just dirty. |
| |
# |
| |
|
| # Zombie resources don't produce anything useful. |
# Zombie resources don't produce anything useful. |
| |
|
|
Line 336 sub parse_resource {
|
Line 389 sub parse_resource {
|
| return undef; |
return undef; |
| } |
} |
| |
|
| my $rid=$lpc.'.'.$token->[2]->{'id'}; |
my $rid=$lpc.'.'.$token->[2]->{'id'}; # Resource id in hash is levelcounter.id-in-xml. |
| |
|
| |
# Save the hash element type and title: |
| |
|
| $hash{'kind_'.$rid}='res'; |
$hash{'kind_'.$rid}='res'; |
| $hash{'title_'.$rid}=$token->[2]->{'title'}; |
$hash{'title_'.$rid}=$token->[2]->{'title'}; |
| |
|
| |
# Get the version free URI for the resource. |
| |
# If a 'version' attribute was supplied, and this resource's version |
| |
# information has not yet been stored, store it. |
| |
# |
| |
|
| my $turi=&versiontrack($token->[2]->{'src'}); |
my $turi=&versiontrack($token->[2]->{'src'}); |
| if ($token->[2]->{'version'}) { |
if ($token->[2]->{'version'}) { |
| unless ($hash{'version_'.$turi}) { |
unless ($hash{'version_'.$turi}) { |
| $hash{'version_'.$turi}=$1; |
$hash{'version_'.$turi}=$1; |
| } |
} |
| } |
} |
| |
# Pull out the title and do entity substitution on &colon |
| |
# Q: Why no other entity substitutions? |
| |
|
| my $title=$token->[2]->{'title'}; |
my $title=$token->[2]->{'title'}; |
| $title=~s/\&colon\;/\:/gs; |
$title=~s/\&colon\;/\:/gs; |
| # my $symb=&Apache::lonnet::encode_symb($uri, |
|
| # $token->[2]->{'id'}, |
|
| # $turi); |
|
| # &Apache::lonnet::do_cache_new('title',$symb,$title); |
# I think the point of all this code is to construct a final |
| |
# URI that apache and its rewrite rules can use to |
| |
# fetch the resource. Thi s sonly necessary if the resource |
| |
# is not a page. If the resource is a page then it must be |
| |
# assembled (at fetch time?). |
| |
|
| unless ($ispage) { |
unless ($ispage) { |
| $turi=~/\.(\w+)$/; |
$turi=~/\.(\w+)$/; |
| my $embstyle=&Apache::loncommon::fileembstyle($1); |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
|
Line 378 sub parse_resource {
|
Line 447 sub parse_resource {
|
| } |
} |
| } |
} |
| } |
} |
| # Store reverse lookup, remove query string |
# Store reverse lookup, remove query string resource 'ids'_uri => resource id. |
| |
# If the URI appears more than one time in the sequence, it's resourcde |
| |
# id's are constructed as a comma spearated list. |
| |
|
| my $idsuri=$turi; |
my $idsuri=$turi; |
| $idsuri=~s/\?.+$//; |
$idsuri=~s/\?.+$//; |
| if (defined($hash{'ids_'.$idsuri})) { |
if (defined($hash{'ids_'.$idsuri})) { |
|
Line 387 sub parse_resource {
|
Line 459 sub parse_resource {
|
| $hash{'ids_'.$idsuri}=''.$rid; |
$hash{'ids_'.$idsuri}=''.$rid; |
| } |
} |
| |
|
| |
|
| |
|
| if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard|viewclasslist)$/) { |
if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard|viewclasslist)$/) { |
| $turi.='?register=1'; |
$turi.='?register=1'; |
| } |
} |
| |
|
| |
|
| |
# resource id lookup: 'src'_resourc-di => URI decorated with a query |
| |
# parameter as above if necessary due to the resource type. |
| |
|
| $hash{'src_'.$rid}=$turi; |
$hash{'src_'.$rid}=$turi; |
| |
|
| |
# Mark the external-ness of the resource: |
| |
|
| if ($token->[2]->{'external'} eq 'true') { |
if ($token->[2]->{'external'} eq 'true') { |
| $hash{'ext_'.$rid}='true:'; |
$hash{'ext_'.$rid}='true:'; |
| } else { |
} else { |
| $hash{'ext_'.$rid}='false:'; |
$hash{'ext_'.$rid}='false:'; |
| } |
} |
| |
|
| |
# If the resource is a start/finish resource set those |
| |
# entries in the has so that navigation knows where everything starts. |
| |
# TODO? If there is a malformed sequence that has no start or no finish |
| |
# resource, should this be detected and errors thrown? How would such a |
| |
# resource come into being other than being manually constructed by a person |
| |
# and then uploaded? Could that happen if an author decided a sequence was almost |
| |
# right edited it by hand and then reuploaded it to 'fix it' but accidently cut the |
| |
# start or finish resources? |
| |
# |
| |
# All resourcess also get a type_id => (start | finish | normal) hash entr. |
| |
# |
| if ($token->[2]->{'type'}) { |
if ($token->[2]->{'type'}) { |
| $hash{'type_'.$rid}=$token->[2]->{'type'}; |
$hash{'type_'.$rid}=$token->[2]->{'type'}; |
| if ($token->[2]->{'type'} eq 'start') { |
if ($token->[2]->{'type'} eq 'start') { |
|
Line 409 sub parse_resource {
|
Line 501 sub parse_resource {
|
| } else { |
} else { |
| $hash{'type_'.$rid}='normal'; |
$hash{'type_'.$rid}='normal'; |
| } |
} |
| |
|
| |
# Sequences end pages are constructed entities. They require that the |
| |
# map that defines _them_ be loaded as well into the hash...with this resourcde |
| |
# as the base of the nesting. |
| |
# Resources like that are also marked with is_map_id => 1 entries. |
| |
# |
| |
|
| if (($turi=~/\.sequence$/) || |
if (($turi=~/\.sequence$/) || |
| ($turi=~/\.page$/)) { |
($turi=~/\.page$/)) { |
|
Line 418 sub parse_resource {
|
Line 516 sub parse_resource {
|
| return $token->[2]->{'id'}; |
return $token->[2]->{'id'}; |
| } |
} |
| |
|
| |
#-------------------------------------------------------------------- link |
| |
# Links define how you are allowed to move from one resource to another. |
| |
# They are the transition edges in the directed graph that a map is. |
| |
# This sub takes informatino from a <link> tag and constructs the |
| |
# navigation bits and pieces of a map. There is no requirement that the |
| |
# resources that are linke are already defined, however clearly the map is |
| |
# badly broken if they are not _eventually_ defined. |
| |
# |
| |
# Note that links can be unconditional or conditional. |
| |
# |
| |
# Parameters: |
| |
# linkpc - The link counter for this level of map nesting (this is |
| |
# reset to zero by loadmap prior to starting to process |
| |
# links for map). |
| |
# lpc - The map level ocounter (how deeply nested this map is in |
| |
# the hierarchy of maps that are recursively read in. |
| |
# to - resource id (within the XML) of the target of the edge. |
| |
# from - resource id (within the XML) of the source of the edge. |
| |
# condition- id of condition associated with the edge (also within the XML). |
| |
# |
| |
|
| sub make_link { |
sub make_link { |
| my ($linkpc,$lpc,$to,$from,$condition) = @_; |
my ($linkpc,$lpc,$to,$from,$condition) = @_; |
| |
|
| |
# Compute fully qualified ids for the link, the |
| |
# and from/to by prepending lpc. |
| |
# |
| |
|
| my $linkid=$lpc.'.'.$linkpc; |
my $linkid=$lpc.'.'.$linkpc; |
| my $goesto=$lpc.'.'.$to; |
my $goesto=$lpc.'.'.$to; |
| my $comesfrom=$lpc.'.'.$from; |
my $comesfrom=$lpc.'.'.$from; |
| my $undercond=0; |
my $undercond=0; |
| |
|
| |
|
| |
# If there is a condition, qualify it with the level counter. |
| |
|
| if ($condition) { |
if ($condition) { |
| $undercond=$lpc.'.'.$condition; |
$undercond=$lpc.'.'.$condition; |
| } |
} |
| |
|
| |
# Links are represnted by: |
| |
# goesto_.fuullyqualifedlinkid => fully qualified to |
| |
# comesfrom.fullyqualifiedlinkid => fully qualified from |
| |
# undercond_.fullyqualifiedlinkid => fully qualified condition id. |
| |
|
| $hash{'goesto_'.$linkid}=$goesto; |
$hash{'goesto_'.$linkid}=$goesto; |
| $hash{'comesfrom_'.$linkid}=$comesfrom; |
$hash{'comesfrom_'.$linkid}=$comesfrom; |
| $hash{'undercond_'.$linkid}=$undercond; |
$hash{'undercond_'.$linkid}=$undercond; |
| |
|
| |
# In addition: |
| |
# to_.fully qualified from => comma separated list of |
| |
# link ids with that from. |
| |
# Similarly: |
| |
# from_.fully qualified to => comma separated list of link ids` |
| |
# with that to. |
| |
# That allows us given a resource id to know all edges that go to it |
| |
# and leave from it. |
| |
# |
| |
|
| if (defined($hash{'to_'.$comesfrom})) { |
if (defined($hash{'to_'.$comesfrom})) { |
| $hash{'to_'.$comesfrom}.=','.$linkid; |
$hash{'to_'.$comesfrom}.=','.$linkid; |
| } else { |
} else { |
|
Line 447 sub make_link {
|
Line 588 sub make_link {
|
| } |
} |
| |
|
| # ------------------------------------------------------------------- Condition |
# ------------------------------------------------------------------- Condition |
| |
# |
| |
# Processes <condition> tags, storing sufficient information about them |
| |
# in the hash so that they can be evaluated and used to conditionalize |
| |
# what is presented to the student. |
| |
# |
| |
# these can have the following attributes |
| |
# |
| |
# id = A unique identifier of the condition within the map. |
| |
# |
| |
# value = Is a perl script-let that, when evaluated in safe space |
| |
# determines whether or not the condition is true. |
| |
# Normally this takes the form of a test on an Apache::lonnet::EXT call |
| |
# to find the value of variable associated with a resource in the |
| |
# map identified by a mapalias. |
| |
# Here's a fragment of XML code that illustrates this: |
| |
# |
| |
# <param to="5" value="mainproblem" name="parameter_0_mapalias" type="string" /> |
| |
# <resource src="" id="1" type="start" title="Start" /> |
| |
# <resource src="/res/msu/albertel/b_and_c/p1.problem" id="5" title="p1.problem" /> |
| |
# <condition value="&EXT('user.resource.resource.0.tries','mainproblem') |
| |
# <2 " id="61" type="stop" /> |
| |
# <link to="5" index="1" from="1" condition="61" /> |
| |
# |
| |
# In this fragment: |
| |
# - The param tag establishes an alias to resource id 5 of 'mainproblem'. |
| |
# - The resource that is the start of the map is identified. |
| |
# - The resource tag identifies the resource associated with this tag |
| |
# and gives it the id 5. |
| |
# - The condition is true if the tries variable associated with mainproblem |
| |
# is less than 2 (that is the user has had more than 2 tries). |
| |
# The condition type is a stop condition which inhibits(?) the associated |
| |
# link if the condition is false. |
| |
# - The link to resource 5 from resource 1 is affected by this condition. |
| |
# |
| |
# type = Type of the condition. The type determines how the condition affects the |
| |
# link associated with it and is one of |
| |
# - 'force' |
| |
# - 'stop' |
| |
# anything else including not supplied..which treated as: |
| |
# - 'normal'. |
| |
# Presumably maps get created by the resource assembly tool and therefore |
| |
# illegal type values won't squirm their way into the XML. |
| |
# |
| |
# Side effects: |
| |
# - The kind_level-qualified-condition-id hash element is set to 'cond'. |
| |
# - The condition text is pushed into the cond array and its element number is |
| |
# set in the condid_level-qualified-condition-id element of the hash. |
| |
# - The condition type is colon appneded to the cond array element for this condition. |
| sub parse_condition { |
sub parse_condition { |
| my ($token,$lpc) = @_; |
my ($token,$lpc) = @_; |
| my $rid=$lpc.'.'.$token->[2]->{'id'}; |
my $rid=$lpc.'.'.$token->[2]->{'id'}; |
|
Line 547 sub parse_param {
|
Line 736 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 561 sub parse_mapalias_param {
|
Line 788 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 570 sub simplify {
|
Line 801 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 584 sub simplify {
|
Line 815 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 602 sub traceroute {
|
Line 862 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 615 sub traceroute {
|
Line 877 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 627 sub traceroute {
|
Line 892 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.')&('. |
|
Line 638 sub traceroute {
|
Line 912 sub traceroute {
|
| $errtext.=&mt('<br />Undefined condition ID: [_1]',$hash{'undercond_'.$id}); |
$errtext.=&mt('<br />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 648 sub traceroute {
|
Line 923 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 671 sub accinit {
|
Line 963 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 689 sub accinit {
|
Line 986 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 1052 sub build_tmp_hashes {
|
Line 1351 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 1060 sub build_tmp_hashes {
|
Line 1362 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; |
| |
|
| |
# Load the map.. note that loadmap may implicitly recurse if the map contains |
| |
# sub-maps. |
| |
|
| |
|
| &loadmap($uri,'0.0'); |
&loadmap($uri,'0.0'); |
| |
|
| |
# 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, |
![[BACK]](/icons/back.gif){kind=icon}
Return to lonuserstate.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / rat