--- loncom/homework/response.pm 2002/02/14 21:48:31 1.59 +++ loncom/homework/response.pm 2002/10/14 20:37:27 1.66 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.59 2002/02/14 21:48:31 albertel Exp $ +# $Id: response.pm,v 1.66 2002/10/14 20:37:27 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,7 @@ package Apache::response; use strict; BEGIN { - &Apache::lonxml::register('Apache::response',('responseparam','parameter','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse','externalresponse')); + &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse')); } sub start_response { @@ -62,11 +62,13 @@ sub start_hintresponse { my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); if ($id eq '') { $id = $Apache::lonxml::curdepth; } push (@Apache::inputtags::response,$id); + push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]); return $id; } sub end_hintresponse { pop @Apache::inputtags::response; + %Apache::inputtags::params=@{pop(@Apache::inputtags::paramstack)}; return ''; } @@ -89,7 +91,7 @@ sub setrandomnumber { $rndseed=$rndseed +&Apache::lonnet::numval($Apache::inputtags::response['-1']); } - srand($rndseed); + &Math::Random::random_set_seed_from_phrase($rndseed); &Apache::lonxml::debug("randseed $rndseed"); return ''; } @@ -205,71 +207,6 @@ sub handle_previous { } } -sub start_caparesponse { - require Apache::caparesponse; - import Apache::caparesponse; - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; -# print "\n
\nsimple caparesponse\n"; - return &Apache::caparesponse::start_caparesponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); -} - -sub start_stringresponse { - require Apache::caparesponse; - import Apache::caparesponse; - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return &Apache::caparesponse::start_stringresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); -} - -sub start_formularesponse { - require Apache::caparesponse; - import Apache::caparesponse; - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return &Apache::caparesponse::start_formularesponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); -} - -sub start_numericalresponse { - require Apache::caparesponse; - import Apache::caparesponse; - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return &Apache::caparesponse::start_numericalresponse - ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); -} - -sub start_radiobuttonresponse { - require Apache::radiobuttonresponse; - import Apache::radiobuttonresponse; - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return &Apache::radiobuttonresponse::start_radiobuttonresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); -} - -sub start_optionresponse { - require Apache::optionresponse; - import Apache::optionresponse; - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return &Apache::optionresponse::start_optionresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); -} - -sub start_imageresponse { - require Apache::imageresponse; - import Apache::imageresponse; - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return &Apache::imageresponse::start_imageresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); -} - -sub start_essayresponse { - require Apache::essayresponse; - import Apache::essayresponse; - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return &Apache::essayresponse::start_essayresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); -} - -sub start_externalresponse { - require Apache::externalresponse; - import Apache::externalresponse; - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return &Apache::externalresponse::start_externalresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); -} - sub view_or_modify { my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); my $myself=0; @@ -308,7 +245,7 @@ sub end_dataresponse { my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser(); my $allowed=&Apache::lonnet::allowed('mgr',$courseid); if ($allowed) { - &Apache::response::setup_params('datasubmission'); + &Apache::response::setup_params('dataresponse'); my $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; my $response = $ENV{'form.HWVAL'.$id}; @@ -356,11 +293,12 @@ sub start_responseparam { $result = &Apache::edit::rebuild_tag($token); $result.=&Apache::edit::handle_insert(); } - } elsif ($target eq 'grade' || $target eq 'answer' ) { + } elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' || + $target eq 'tex' || $target eq 'analyze' ) { if ($ENV{'request.state'} eq 'construct') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); my $default = &Apache::lonxml::get_param('default',$parstack,$safeeval); - $Apache::inputtags::params{$name}=$default; + if ($name) {$Apache::inputtags::params{$name}=$default;} } } return $result; @@ -386,7 +324,7 @@ sub setup_params { my ($tag) = @_; if ($ENV{'request.state'} eq 'construct') { return; } - @Apache::inputtags::params=(); + %Apache::inputtags::params=(); my %paramlist=(); foreach my $key (keys(%Apache::lonnet::packagetab)) { if ($key =~ /^$tag/) { @@ -448,6 +386,14 @@ sub answer_footer { return $result; } +sub showallfoils { + my $return=0; + if (defined($ENV{'form.showallfoils'}) && + $ENV{'request.state'} eq 'construct') { + $return=1; + } + return $return; +} 1; __END__