version 1.9, 2001/05/31 22:34:33
|
version 1.10, 2001/06/01 15:56:49
|
Line 99 sub end_foilgroup {
|
Line 99 sub end_foilgroup {
|
|
|
sub getfoilcounts { |
sub getfoilcounts { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $rrargs =''; |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; } |
|
my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval); |
|
# +1 since instructors will count from 1 |
# +1 since instructors will count from 1 |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
return ($count,$max); |
return ($count,$max); |
Line 169 sub end_conceptgroup {
|
Line 167 sub end_conceptgroup {
|
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"}; |
$Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"}; |
$Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"}; |
$Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"}; |
my $args; |
my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); |
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
|
my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval); |
|
$Apache::response::foilgroup{"$name.concept"} = $concept; |
$Apache::response::foilgroup{"$name.concept"} = $concept; |
&Apache::lonxml::debug("Selecting $name in $concept"); |
&Apache::lonxml::debug("Selecting $name in $concept"); |
} |
} |
Line 189 sub end_foil {
|
Line 185 sub end_foil {
|
my $text =''; |
my $text =''; |
if ($target eq 'web') { $text=&Apache::lonxml::endredirection; } |
if ($target eq 'web') { $text=&Apache::lonxml::endredirection; } |
if ($target eq 'web' || $target eq 'grade') { |
if ($target eq 'web' || $target eq 'grade') { |
my $args =''; |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
|
my $value = &Apache::run::run("{$args;".'return $value}',$safeeval); |
|
if ($value ne 'unused') { |
if ($value ne 'unused') { |
my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
if ( $Apache::optionresponse::conceptgroup ) { |
if ( $Apache::optionresponse::conceptgroup ) { |
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
Line 206 sub end_foil {
|
Line 200 sub end_foil {
|
} |
} |
} |
} |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
my $args =''; |
my $options= &Apache::lonxml::get_param('options',$parstack,$safeeval); |
if ( $#$parstack > 1 ) { $args=$$parstack['-2']; } |
|
my $options=&Apache::run::run("{$args;".'return $options}',$safeeval); |
|
if (!$options && $#$parstack > 2 ) { $args=$$parstack['-2']; } |
if (!$options && $#$parstack > 2 ) { $args=$$parstack['-2']; } |
my @opt; |
my @opt; |
#eval '@opt ='. |
#eval '@opt ='. |