--- loncom/homework/optionresponse.pm 2001/06/16 21:23:11 1.17
+++ loncom/homework/optionresponse.pm 2001/08/06 20:33:23 1.22
@@ -40,14 +40,6 @@ sub end_optionresponse {
return $result;
}
-sub insert_optionresponse {
- return '
-
-
-
-';
-}
-
%Apache::response::foilgroup={};
sub start_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -240,15 +232,18 @@ sub end_conceptgroup {
$Apache::optionresponse::conceptgroup=0;
my $result='';
if ($target eq 'web' || $target eq 'grade') {
- my @names = @{ $Apache::response::conceptgroup{'names'} };
- my $pick=int rand $#names+1;
- my $name=$names[$pick];
- push @{ $Apache::response::foilgroup{'names'} }, $name;
- $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};
- $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
- my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
- $Apache::response::foilgroup{"$name.concept"} = $concept;
- &Apache::lonxml::debug("Selecting $name in $concept");
+ #if not there aren't any foils to display and thus no question
+ if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
+ my @names = @{ $Apache::response::conceptgroup{'names'} };
+ my $pick=int rand $#names+1;
+ my $name=$names[$pick];
+ push @{ $Apache::response::foilgroup{'names'} }, $name;
+ $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};
+ $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
+ my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+ $Apache::response::foilgroup{"$name.concept"} = $concept;
+ &Apache::lonxml::debug("Selecting $name in $concept");
+ }
}
if ($target eq 'edit') {
$result=&Apache::edit::end_table();
@@ -257,7 +252,7 @@ sub end_conceptgroup {
}
sub insert_conceptgroup {
- my $result="\t\t\n".&insert_foil()."\t\t\n";
+ my $result="\n\t\t".&insert_foil()."\n\t\t\n";
return $result;
}
@@ -271,9 +266,9 @@ sub start_foil {
if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
my @opt;
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
- $result.=&Apache::edit::text_arg('Name:','name',$token).
- &Apache::edit::select_arg('Correct Option:','value',['unused',(@opt)],$token).
- '
';
+ $result.=&Apache::edit::text_arg('Name:','name',$token);
+ $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
+ $result .= ' |
';
}
if ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
@@ -291,7 +286,9 @@ sub end_foil {
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ &Apache::lonxml::debug("Got a name of :$name:");
if (!$name) { $name=$Apache::lonxml::curdepth; }
+ &Apache::lonxml::debug("Using a name of :$name:");
if ( $Apache::optionresponse::conceptgroup ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.
|