version 1.62, 2006/01/09 18:51:26
|
version 1.66, 2006/03/06 23:41:07
|
Line 46 sub cleanup {
|
Line 46 sub cleanup {
|
&Apache::lonnet::logthis('Failed cleanup pageflip: hash'); |
&Apache::lonnet::logthis('Failed cleanup pageflip: hash'); |
} |
} |
} |
} |
|
return OK; |
} |
} |
|
|
sub addrid { |
sub addrid { |
Line 83 sub hash_src {
|
Line 84 sub hash_src {
|
return ($hash{'src_'.$id},$symb); |
return ($hash{'src_'.$id},$symb); |
} |
} |
|
|
|
# Inputs are a url, adn a hash ref of |
|
# form name => value pairs |
|
# takes care of properly adding the form name elements and values to the |
|
# the url doing proper escaping of the values and joining with ? or & as |
|
# needed |
|
|
|
sub add_get_param { |
|
my ($url,$form_data) = @_; |
|
my $needs_question_mark = ($url !~ /\?/); |
|
|
|
while (my ($name,$value) = each(%$form_data)) { |
|
if ($needs_question_mark) { |
|
$url.='?'; |
|
$needs_question_mark = 0; |
|
} else { |
|
$url.='&'; |
|
} |
|
$url.=$name.'='.&Apache::lonnet::escape($form_data->{$name}); |
|
} |
|
return $url; |
|
} |
|
|
sub move { |
sub move { |
my ($rid,$mapurl,$direction)=@_; |
my ($rid,$mapurl,$direction)=@_; |
my $startoutrid=$rid; |
my $startoutrid=$rid; |
Line 97 sub move {
|
Line 120 sub move {
|
$rid=$hash{'ids_'.$hash{'map_id_'.(split(/\./,$rid))[0]}}; |
$rid=$hash{'ids_'.$hash{'map_id_'.(split(/\./,$rid))[0]}}; |
} |
} |
foreach my $id (split(/\,/,$hash{'to_'.$rid})) { |
foreach my $id (split(/\,/,$hash{'to_'.$rid})) { |
my $thiscond= |
my $condition= $hash{'conditions_'.$hash{'goesto_'.$id}}; |
&Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$id}}); |
my $rescond = &Apache::lonnet::docondval($condition); |
if ($thiscond>=$mincond) { |
my $linkcond = &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$id}}); |
|
my $thiscond = ($rescond<$linkcond)?$rescond:$linkcond; |
|
if ($thiscond>=$mincond) { |
if ($posnext) { |
if ($posnext) { |
$posnext.=','.$id.':'.$thiscond; |
$posnext.=','.$id.':'.$thiscond; |
} else { |
} else { |
Line 137 sub move {
|
Line 162 sub move {
|
$rid=$hash{'ids_'.$hash{'map_id_'.(split(/\./,$rid))[0]}}; |
$rid=$hash{'ids_'.$hash{'map_id_'.(split(/\./,$rid))[0]}}; |
} |
} |
foreach my $id (split(/\,/,$hash{'from_'.$rid})) { |
foreach my $id (split(/\,/,$hash{'from_'.$rid})) { |
my $thiscond= |
my $condition= $hash{'conditions_'.$hash{'comesfrom_'.$id}}; |
&Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$id}}); |
my $rescond = &Apache::lonnet::docondval($condition); |
|
my $linkcond = &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$id}}); |
|
my $thiscond = ($rescond<$linkcond)?$rescond:$linkcond; |
if ($thiscond>=$mincond) { |
if ($thiscond>=$mincond) { |
if ($posnext) { |
if ($posnext) { |
$posnext.=','.$id.':'.$thiscond; |
$posnext.=','.$id.':'.$thiscond; |
Line 394 sub handler {
|
Line 421 sub handler {
|
|
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
my $url='http://'.$ENV{'HTTP_HOST'}.$redirecturl; |
my $url='http://'.$ENV{'HTTP_HOST'}.$redirecturl; |
if ($redirectsymb ne '') { $url.='?symb='.&Apache::lonnet::escape($redirectsymb); } |
$url = &add_get_param($url, { 'symb' => $redirectsymb}); |
$r->header_out(Location => $url); |
$r->header_out(Location => $url); |
return REDIRECT; |
return REDIRECT; |
} else { |
} else { |
Line 428 ENDSTART
|
Line 455 ENDSTART
|
foreach my $id (@possibilities) { |
foreach my $id (@possibilities) { |
$r->print( |
$r->print( |
'<tr><td><a href="'. |
'<tr><td><a href="'. |
$multichoicehash{'src_'.$id}.'?symb=' . |
&add_get_param($multichoicehash{'src_'.$id}, |
Apache::lonnet::escape($multichoicehash{'symb_'.$id}).'">'. |
{'symb' => |
|
$multichoicehash{'symb_'.$id}, |
|
}).'">'. |
$multichoicehash{'title_'.$id}. |
$multichoicehash{'title_'.$id}. |
'</a></td><td>'.$multichoicehash{'type_'.$id}. |
'</a></td><td>'.$multichoicehash{'type_'.$id}. |
'</td></tr>'); |
'</td></tr>'); |