--- loncom/homework/response.pm 2002/01/11 16:32:29 1.56 +++ loncom/homework/response.pm 2002/02/15 22:16:04 1.60 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.56 2002/01/11 16:32:29 matthew Exp $ +# $Id: response.pm,v 1.60 2002/02/15 22:16:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,8 +32,8 @@ package Apache::response; use strict; -sub BEGIN { - &Apache::lonxml::register('Apache::response',('responseparam','parameter','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse')); +BEGIN { + &Apache::lonxml::register('Apache::response',('responseparam','parameter','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse','externalresponse')); } 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 ''; } @@ -78,7 +80,8 @@ sub setrandomnumber { $rndseed=$ENV{'form.rndseed'}; if (!$rndseed) { $rndseed=time; } } else { - $rndseed=&Apache::lonnet::rndseed(); + my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name); } &Apache::lonxml::debug("randseed $rndseed"); # $rndseed=unpack("%32i",$rndseed); @@ -262,6 +265,13 @@ sub start_essayresponse { 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; @@ -348,7 +358,8 @@ sub start_responseparam { $result = &Apache::edit::rebuild_tag($token); $result.=&Apache::edit::handle_insert(); } - } elsif ($target eq 'grade') { + } elsif ($target eq 'grade' || $target eq 'answer' || + $target eq 'web' || $target eq 'tex') { if ($ENV{'request.state'} eq 'construct') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); my $default = &Apache::lonxml::get_param('default',$parstack,$safeeval); @@ -378,7 +389,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/) {