--- loncom/homework/response.pm 2000/11/28 20:11:25 1.10 +++ loncom/homework/response.pm 2001/02/07 00:29:59 1.21 @@ -7,7 +7,25 @@ package Apache::response; use strict; sub BEGIN { - &Apache::lonxml::register('Apache::response',('responseparam','caparesponse')); + &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','radiobuttonresponse','optionresponse','imageresponse')); +} + +sub start_response { + my ($parstack,$safeeval)=@_; + my $args =''; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); + if ($id eq '') { $id = $Apache::lonxml::curdepth; } + push (@Apache::inputtags::response,$id); + push (@Apache::inputtags::responselist,$id); + @Apache::inputtags::inputlist=(); + return $id; +} + +sub end_response { + pop @Apache::inputtags::response; + @Apache::inputtags::inputlist=(); + return ''; } sub meta_parameter_write { @@ -62,6 +80,18 @@ sub mandatory_part_meta { # } +sub check_for_previous { + return '0'; +} + +sub start_numericalresponse { + require Apache::caparesponse; + import Apache::caparesponse; + my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + Apache::caparesponse::start_numericalresponse($target,$token,$parstack,$parser,$safeeval,$style);; + return ""; +} + sub start_caparesponse { require Apache::caparesponse; import Apache::caparesponse; @@ -71,9 +101,33 @@ sub start_caparesponse { return ""; } +sub start_radiobuttonresponse { + require Apache::radiobuttonresponse; + import Apache::radiobuttonresponse; + my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + Apache::radiobuttonresponse::start_radiobuttonresponse($target,$token,$parstack,$parser,$safeeval,$style);; + return ""; +} + +sub start_optionresponse { + require Apache::optionresponse; + import Apache::optionresponse; + my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + Apache::optionresponse::start_optionresponse($target,$token,$parstack,$parser,$safeeval,$style);; + return ""; +} + +sub start_imageresponse { + require Apache::imageresponse; + import Apache::imageresponse; + my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + Apache::imageresponse::start_imageresponse($target,$token,$parstack,$parser,$safeeval,$style);; + return ""; +} + sub start_responseparam { my ($target,$token,$parstack,$parser,$safeeval)=@_; - if ($target ne 'meta') { + if ($target eq 'grade' || $target eq 'web') { my $args=''; if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } my $default = &Apache::run::run("{$args;".'return $default}',$safeeval); @@ -81,17 +135,21 @@ sub start_responseparam { &Apache::lonxml::debug("looking for resource.$Apache::inputtags::part.$name"); my $value = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.$name"); &Apache::lonxml::debug("$name has value :$value: and default :$default:"); - if (!$value) { + if ($value eq '' || $value eq 'con_lost') { + &Apache::lonxml::debug("defaulting"); $Apache::inputtags::params{$name}=$default; } else { + &Apache::lonxml::debug("using value"); $Apache::inputtags::params{$name}=$value; } return ''; - } else { + } elsif ($target eq 'meta') { return &meta_parameter_write($token->[2]->{'name'}, $token->[2]->{'type'}, $token->[2]->{'default'}, $token->[2]->{'description'}); + } else { + return ''; } }