version 1.158, 2003/03/13 19:57:10
|
version 1.163, 2003/03/20 18:38:01
|
Line 550 Most of these parameters are only useful
|
Line 550 Most of these parameters are only useful
|
|
|
=item * B<condenseParts>: A flag. If yes (default), if all parts of the problem have the same status and that status is Nothing Set, Correct, or Network Failure, then only one line will be displayed for that resource anyhow. If no, all parts will always be displayed. If showParts is 0, this is ignored. |
=item * B<condenseParts>: A flag. If yes (default), if all parts of the problem have the same status and that status is Nothing Set, Correct, or Network Failure, then only one line will be displayed for that resource anyhow. If no, all parts will always be displayed. If showParts is 0, this is ignored. |
|
|
=item * B<jumpCount>: A string identifying the URL to place the anchor 'curloc' at. Default to no anchor at all. It is the responsibility of the renderer user to ensure that the #curloc is in the URL. By default, determined through the use of the ENV{} 'jump' and 'jumpType' information. |
=item * B<jumpCount>: A string identifying the URL to place the anchor 'curloc' at. Default to no anchor at all. It is the responsibility of the renderer user to ensure that the #curloc is in the URL. By default, determined through the use of the ENV{} 'jump' information, and should normally "just work" correctly. |
|
|
=item * B<here>: A Symb identifying where to place the 'here' marker. Default empty, which means no marker. |
=item * B<here>: A Symb identifying where to place the 'here' marker. Default empty, which means no marker. |
|
|
Line 651 sub render_resource {
|
Line 651 sub render_resource {
|
$linkopen .= "&condition=" . $it->{CONDITION} . '&hereType=' |
$linkopen .= "&condition=" . $it->{CONDITION} . '&hereType=' |
. $params->{'hereType'} . '&here=' . |
. $params->{'hereType'} . '&here=' . |
&Apache::lonnet::escape($params->{'here'}) . |
&Apache::lonnet::escape($params->{'here'}) . |
'&jumpType=' . SYMB() . '&jump=' . |
'&jump=' . |
&Apache::lonnet::escape($resource->symb()) . |
&Apache::lonnet::escape($resource->symb()) . |
"&folderManip=1'>"; |
"&folderManip=1'>"; |
} else { |
} else { |
Line 700 sub render_resource {
|
Line 700 sub render_resource {
|
$title = ""; |
$title = ""; |
} |
} |
|
|
if ($params->{'multipart'} && $params->{'condensed'}) { |
if ($params->{'condensed'} && $resource->countParts() > 1) { |
$nonLinkedText .= ' (' . $resource->countParts() . ' parts)'; |
$nonLinkedText .= ' (' . $resource->countParts() . ' parts)'; |
} |
} |
|
|
Line 839 sub render {
|
Line 839 sub render {
|
|
|
my $r = $args->{'r'}; |
my $r = $args->{'r'}; |
my $queryString = $args->{'queryString'}; |
my $queryString = $args->{'queryString'}; |
my $jumpToURL = $args->{'jumpToURL'}; |
my $jump = $args->{'jump'}; |
my $jumpToSymb = $args->{'jumpToSymb'}; |
|
my $jumpType; |
|
my $here = $args->{'here'}; |
my $here = $args->{'here'}; |
my $jump; |
|
my $currentJumpIndex = setDefault($args->{'currentJumpIndex'}, 0); |
|
my $suppressNavmap = setDefault($args->{'suppressNavmap'}, 0); |
my $suppressNavmap = setDefault($args->{'suppressNavmap'}, 0); |
my $currentJumpDelta = 2; # change this to change how many resources are displayed |
my $currentJumpDelta = 2; # change this to change how many resources are displayed |
# before the current resource when using #current |
# before the current resource when using #current |
Line 879 sub render {
|
Line 875 sub render {
|
# Step two: Locate what kind of here marker is necessary |
# Step two: Locate what kind of here marker is necessary |
# Determine where the "here" marker is and where the screen jumps to. |
# Determine where the "here" marker is and where the screen jumps to. |
|
|
# We're coming from the remote. We have either a url, a symb, or nothing, |
|
# and we need to figure out what. |
|
# Preference: Symb |
|
|
|
if ($ENV{'form.symb'}) { |
if ($ENV{'form.symb'}) { |
$here = $jump = $ENV{'form.symb'}; |
$here = $jump = $ENV{'form.symb'}; |
} elsif ($ENV{'form.postdata'}) { |
} elsif ($ENV{'form.postdata'}) { |
Line 899 sub render {
|
Line 891 sub render {
|
my $depth = 1; |
my $depth = 1; |
$mapIterator->next(); # discard the first BEGIN_MAP |
$mapIterator->next(); # discard the first BEGIN_MAP |
my $curRes = $mapIterator->next(); |
my $curRes = $mapIterator->next(); |
my $counter = 0; |
|
my $found = 0; |
my $found = 0; |
|
|
# We only need to do this if we need to open the maps to show the |
# We only need to do this if we need to open the maps to show the |
Line 925 sub render {
|
Line 916 sub render {
|
|
|
$curRes = $mapIterator->next(); |
$curRes = $mapIterator->next(); |
} |
} |
|
|
# Since we changed the folders, (re-)locate the jump point, if any |
|
$mapIterator = $navmap->getIterator(undef, undef, $filterHash, 0); |
|
$depth = 1; |
|
$mapIterator->next(); |
|
$curRes = $mapIterator->next(); |
|
my $foundJump = 0; |
|
|
|
while ($depth > 0 && !$foundJump) { |
|
if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; } |
|
if ($curRes == $mapIterator->END_MAP()) { $depth--; } |
|
if (ref($curRes)) { $counter++; } |
|
|
|
if (ref($curRes) && |
|
(($jumpType == SYMB() && $curRes->symb() eq $jump) || |
|
($jumpType == URL() && $curRes->src() eq $jump))) { |
|
|
|
# This is why we have to use the main iterator instead of the |
|
# potentially faster DFS: The count has to be the same, so |
|
# the order has to be the same, which DFS won't give us. |
|
$currentJumpIndex = $counter; |
|
$foundJump = 1; |
|
} |
|
|
|
$curRes = $mapIterator->next(); |
|
} |
|
|
|
} |
} |
|
|
if ( !defined($args->{'iterator'}) && $ENV{'form.folderManip'} ) { # we came from a user's manipulation of the nav page |
if ( !defined($args->{'iterator'}) && $ENV{'form.folderManip'} ) { # we came from a user's manipulation of the nav page |
# If this is a click on a folder or something, we want to preserve the "here" |
# If this is a click on a folder or something, we want to preserve the "here" |
# from the querystring, and get the new "jump" marker |
# from the querystring, and get the new "jump" marker |
Line 987 sub render {
|
Line 952 sub render {
|
} |
} |
} |
} |
|
|
|
# (re-)Locate the jump point, if any |
|
my $mapIterator = $navmap->getIterator(undef, undef, $filterHash, 0); |
|
my $depth = 1; |
|
$mapIterator->next(); |
|
my $curRes = $mapIterator->next(); |
|
my $foundJump = 0; |
|
my $counter = 0; |
|
|
|
while ($depth > 0 && !$foundJump) { |
|
if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; } |
|
if ($curRes == $mapIterator->END_MAP()) { $depth--; } |
|
if (ref($curRes)) { $counter++; } |
|
|
|
if (ref($curRes) && $jump eq $curRes->symb()) { |
|
|
|
# This is why we have to use the main iterator instead of the |
|
# potentially faster DFS: The count has to be the same, so |
|
# the order has to be the same, which DFS won't give us. |
|
$args->{'currentJumpIndex'} = $counter; |
|
$foundJump = 1; |
|
} |
|
|
|
$curRes = $mapIterator->next(); |
|
} |
|
|
my $showParts = setDefault($args->{'showParts'}, 1); |
my $showParts = setDefault($args->{'showParts'}, 1); |
my $condenseParts = setDefault($args->{'condenseParts'}, 1); |
my $condenseParts = setDefault($args->{'condenseParts'}, 1); |
# keeps track of when the current resource is found, |
# keeps track of when the current resource is found, |
Line 1059 sub render {
|
Line 1049 sub render {
|
|
|
my $displayedJumpMarker = 0; |
my $displayedJumpMarker = 0; |
# Set up iteration. |
# Set up iteration. |
my $depth = 1; |
$depth = 1; |
$it->next(); # discard initial BEGIN_MAP |
$it->next(); # discard initial BEGIN_MAP |
my $curRes = $it->next(); |
$curRes = $it->next(); |
my $now = time(); |
my $now = time(); |
my $in24Hours = $now + 24 * 60 * 60; |
my $in24Hours = $now + 24 * 60 * 60; |
my $rownum = 0; |
my $rownum = 0; |
Line 1117 sub render {
|
Line 1107 sub render {
|
|
|
if ($condenseParts) { # do the condensation |
if ($condenseParts) { # do the condensation |
if (!$curRes->opendate("0")) { |
if (!$curRes->opendate("0")) { |
@parts = ("0"); |
@parts = (); |
$args->{'condensed'} = 1; |
$args->{'condensed'} = 1; |
} |
} |
if (!$args->{'condensed'}) { |
if (!$args->{'condensed'}) { |
Line 1149 sub render {
|
Line 1139 sub render {
|
if (($statusAllSame && defined($condenseStatuses{$status})) || |
if (($statusAllSame && defined($condenseStatuses{$status})) || |
($dueAllSame && $status == $curRes->OPEN && $statusAllSame)|| |
($dueAllSame && $status == $curRes->OPEN && $statusAllSame)|| |
($openAllSame && $status == $curRes->OPEN_LATER && $statusAllSame) ){ |
($openAllSame && $status == $curRes->OPEN_LATER && $statusAllSame) ){ |
@parts = ($parts[1]); |
@parts = (); |
$args->{'condensed'} = 1; |
$args->{'condensed'} = 1; |
} |
} |
|
|
Line 1218 sub render {
|
Line 1208 sub render {
|
} |
} |
|
|
# Print out the part that jumps to #curloc if it exists |
# Print out the part that jumps to #curloc if it exists |
|
# delay needed because the browser is processing the jump before |
|
# it finishes rendering, so it goes to the wrong place! |
|
# onload might be better, but this routine has no access to that. |
|
# On mozilla, the 0-millisecond timeout seems to prevent this; |
|
# it's quite likely this might fix other browsers, too, and |
|
# certainly won't hurt anything. |
if ($displayedJumpMarker) { |
if ($displayedJumpMarker) { |
$result .= "<script>location += \"#curloc\";</script>\n"; |
$result .= "<script>setTimeout(\"location += '#curloc';\", 0)</script>\n"; |
} |
} |
|
|
$result .= "</table>"; |
$result .= "</table>"; |
Line 1627 sub parmval_real {
|
Line 1623 sub parmval_real {
|
my ($space,@qualifier)=split(/\./,$rwhat); |
my ($space,@qualifier)=split(/\./,$rwhat); |
my $qualifier=join('.',@qualifier); |
my $qualifier=join('.',@qualifier); |
unless ($space eq '0') { |
unless ($space eq '0') { |
my ($part,$id)=split(/\_/,$space); |
my @parts=split(/_/,$space); |
if ($id) { |
my $id=pop(@parts); |
my $partgeneral=$self->parmval($part.".$qualifier",$symb); |
my $part=join('_',@parts); |
if (defined($partgeneral)) { return $partgeneral; } |
if ($part eq '') { $part='0'; } |
} else { |
my $partgeneral=$self->parmval($part.".$qualifier",$symb); |
my $resourcegeneral=$self->parmval("0.$qualifier",$symb); |
if (defined($partgeneral)) { return $partgeneral; } |
if (defined($resourcegeneral)) { return $resourcegeneral; } |
|
} |
|
} |
} |
return ''; |
return ''; |
} |
} |
Line 1763 getIterator behaves as follows:
|
Line 1757 getIterator behaves as follows:
|
|
|
=over 4 |
=over 4 |
|
|
=item * B<getIterator>(firstResource, finishResource, filterHash, condition, forceTop): All parameters are optional. firstResource is a resource reference corresponding to where the iterator should start. It defaults to navmap->firstResource() for the corresponding nav map. finishResource corresponds to where you want the iterator to end, defaulting to navmap->finishResource(). filterHash is a hash used as a set containing strings representing the resource IDs, defaulting to empty. Condition is a 1 or 0 that sets what to do with the filter hash: If a 0, then only resource that exist IN the filterHash will be recursed on. If it is a 1, only resources NOT in the filterHash will be recursed on. Defaults to 0. forceTop is a boolean value. If it is false (default), the iterator will only return the first level of map that is not just a single, 'redirecting' map. If true, the iterator will return all information, starting with the top-level map, regardless of content. |
=item * B<getIterator>(firstResource, finishResource, filterHash, condition, forceTop, returnTopMap): All parameters are optional. firstResource is a resource reference corresponding to where the iterator should start. It defaults to navmap->firstResource() for the corresponding nav map. finishResource corresponds to where you want the iterator to end, defaulting to navmap->finishResource(). filterHash is a hash used as a set containing strings representing the resource IDs, defaulting to empty. Condition is a 1 or 0 that sets what to do with the filter hash: If a 0, then only resource that exist IN the filterHash will be recursed on. If it is a 1, only resources NOT in the filterHash will be recursed on. Defaults to 0. forceTop is a boolean value. If it is false (default), the iterator will only return the first level of map that is not just a single, 'redirecting' map. If true, the iterator will return all information, starting with the top-level map, regardless of content. returnTopMap, if true (default false), will cause the iterator to return the top-level map object (resource 0.0) before anything else. |
|
|
Thus, by default, only top-level resources will be shown. Change the condition to a 1 without changing the hash, and all resources will be shown. Changing the condition to 1 and including some values in the hash will allow you to selectively suppress parts of the navmap, while leaving it on 0 and adding things to the hash will allow you to selectively add parts of the nav map. See the handler code for examples. |
Thus, by default, only top-level resources will be shown. Change the condition to a 1 without changing the hash, and all resources will be shown. Changing the condition to 1 and including some values in the hash will allow you to selectively suppress parts of the navmap, while leaving it on 0 and adding things to the hash will allow you to selectively add parts of the nav map. See the handler code for examples. |
|
|
Line 1838 sub new {
|
Line 1832 sub new {
|
# Do we want to automatically follow "redirection" maps? |
# Do we want to automatically follow "redirection" maps? |
$self->{FORCE_TOP} = shift; |
$self->{FORCE_TOP} = shift; |
|
|
|
# Do we want to return the top-level map object (resource 0.0)? |
|
$self->{RETURN_0} = shift; |
|
# have we done that yet? |
|
$self->{HAVE_RETURNED_0} = 0; |
|
|
# Now, we need to pre-process the map, by walking forward and backward |
# Now, we need to pre-process the map, by walking forward and backward |
# over the parts of the map we're going to look at. |
# over the parts of the map we're going to look at. |
|
|
Line 1951 sub new {
|
Line 1950 sub new {
|
sub next { |
sub next { |
my $self = shift; |
my $self = shift; |
|
|
|
# If we want to return the top-level map object, and haven't yet, |
|
# do so. |
|
if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0}) { |
|
$self->{HAVE_RETURNED_0} = 1; |
|
return $self->{NAV_MAP}->getById('0.0'); |
|
} |
|
|
if ($self->{RECURSIVE_ITERATOR_FLAG}) { |
if ($self->{RECURSIVE_ITERATOR_FLAG}) { |
# grab the next from the recursive iterator |
# grab the next from the recursive iterator |
my $next = $self->{RECURSIVE_ITERATOR}->next(); |
my $next = $self->{RECURSIVE_ITERATOR}->next(); |
Line 2692 sub countParts {
|
Line 2698 sub countParts {
|
my $self = shift; |
my $self = shift; |
|
|
my $parts = $self->parts(); |
my $parts = $self->parts(); |
|
my $delta = 0; |
|
for my $part (@$parts) { |
|
if ($part eq '0') { $delta--; } |
|
} |
|
|
if ($self->{RESOURCE_ERROR}) { |
if ($self->{RESOURCE_ERROR}) { |
return 0; |
return 0; |
} |
} |
|
|
if (scalar(@{$parts}) < 2) { return 1;} |
return scalar(@{$parts}) + $delta; |
|
|
return scalar(@{$parts}) - 1; |
|
} |
} |
|
|
# Private function: Extracts the parts information and saves it |
# Private function: Extracts the parts information and saves it |