version 1.36, 2002/08/27 18:21:27
|
version 1.37, 2002/10/14 20:37:27
|
Line 200 sub start_labelgroup {
|
Line 200 sub start_labelgroup {
|
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval); |
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval); |
$type =~tr/A-Z/a-z/; |
$type =~tr/A-Z/a-z/; |
if ($target eq 'web' || $target eq 'tex' || |
if ($target eq 'web' || $target eq 'tex' || |
$target eq 'grade' || $target eq 'answer') { |
$target eq 'grade' || $target eq 'answer' || $target eq 'analyze') { |
$Apache::randomlabel::groupname=$name; |
$Apache::randomlabel::groupname=$name; |
$Apache::randomlabel::type=$type; |
$Apache::randomlabel::type=$type; |
@Apache::randomlabel::xcoord = (); |
@Apache::randomlabel::xcoord = (); |
Line 249 sub end_labelgroup {
|
Line 249 sub end_labelgroup {
|
my $gname = $Apache::randomlabel::groupname; |
my $gname = $Apache::randomlabel::groupname; |
my $type = $Apache::randomlabel::type; |
my $type = $Apache::randomlabel::type; |
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') { |
if ($target eq 'web' || $target eq 'answer' || $target eq 'grade' || |
|
$target eq 'analyze') { |
my @idx_arr = (0 .. $#Apache::randomlabel::label_arr); |
my @idx_arr = (0 .. $#Apache::randomlabel::label_arr); |
&Apache::structuretags::shuffle(\@idx_arr); |
&Apache::structuretags::shuffle(\@idx_arr); |
for(0 .. $#Apache::randomlabel::label_arr) { |
for(0 .. $#Apache::randomlabel::label_arr) { |
Line 373 sub start_label {
|
Line 374 sub start_label {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2); |
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2); |
if ($target eq 'web' || $target eq 'tex' || |
if ($target eq 'web' || $target eq 'tex' || |
$target eq 'grade' || $target eq 'answer') { |
$target eq 'grade' || $target eq 'answer' || $target eq 'analyze') { |
my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]); |
my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]); |
$ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]); |
$ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]); |
if ($type eq 'image') { |
if ($type eq 'image') { |