--- loncom/homework/response.pm 2001/10/01 20:18:31 1.49 +++ loncom/homework/response.pm 2003/04/08 02:42:55 1.70 @@ -1,6 +1,30 @@ # The LearningOnline Network with CAPA # various response type definitons response definition - +# +# $Id: response.pm,v 1.70 2003/04/08 02:42:55 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # 11/23,11/24,11/28 Gerd Kortemeyer # Guy Albertelli # 08/04,08/07 Gerd Kortemeyer @@ -8,14 +32,19 @@ package Apache::response; use strict; -sub BEGIN { - &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse')); +BEGIN { + &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse')); } sub start_response { my ($parstack,$safeeval)=@_; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); if ($id eq '') { $id = $Apache::lonxml::curdepth; } + if ($#Apache::inputtags::import > -1) { + &Apache::lonxml::debug("Turning :$id: into"); + $id = join('_',@Apache::inputtags::import).'_'.$id; + &Apache::lonxml::debug("New :$id:"); + } push (@Apache::inputtags::response,$id); push (@Apache::inputtags::responselist,$id); @Apache::inputtags::inputlist=(); @@ -33,11 +62,16 @@ 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; + if (defined($Apache::inputtags::paramstack[-1])) { + %Apache::inputtags::params= + @{ pop(@Apache::inputtags::paramstack) }; + } return ''; } @@ -49,7 +83,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); @@ -59,7 +94,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 ''; } @@ -140,7 +175,7 @@ sub check_for_previous { my ($curresponse,$partid,$id) = @_; my %previous; $previous{'used'} = 0; - foreach my $key (reverse(sort(keys(%Apache::lonhomework::history)))) { + foreach my $key (sort(keys(%Apache::lonhomework::history))) { if ($key =~ /resource\.$partid\.$id\.submission/) { &Apache::lonxml::debug("Trying $key"); my $pastresponse=$Apache::lonhomework::history{$key}; @@ -151,75 +186,30 @@ sub check_for_previous { $history=$1; $previous{'award'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"}; $previous{'last'}='0'; + push(@{ $previous{'version'} },$history); } else { $previous{'award'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"}; $previous{'last'}='1'; } if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN'; } &Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:"); - last; } } } + &Apache::lonhomework::showhash(%previous); return %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 handle_previous { + my ($previous,$ad)=@_; + if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) { + if ($$previous{'last'}) { + push(@Apache::inputtags::previous,'PREVIOUSLY_LAST'); + } else { + push(@Apache::inputtags::previous,'PREVIOUSLY_USED'); + } + push(@Apache::inputtags::previous_version,$$previous{'version'}); + } } sub view_or_modify { @@ -260,10 +250,10 @@ 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}; + my $response = $ENV{'form.HWVAL_'.$id}; my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); if ( $response =~ /[^\s]/) { $Apache::lonhomework::results{"resource.$partid.$id.$name"}= @@ -293,8 +283,7 @@ sub start_responseparam { $token->[2]->{'default'}, $token->[2]->{'description'}); } elsif ($target eq 'edit') { - $result.=&Apache::edit::tag_start($target,$token, - &Apache::lonxml::description($token)); + $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Name:','name',$token). &Apache::edit::text_arg('Type:','type',$token). &Apache::edit::text_arg('Description:','description',$token). @@ -309,6 +298,13 @@ sub start_responseparam { $result = &Apache::edit::rebuild_tag($token); $result.=&Apache::edit::handle_insert(); } + } 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); + if ($name) {$Apache::inputtags::params{$name}=$default;} + } } return $result; } @@ -319,10 +315,24 @@ sub end_responseparam { return ''; } +sub start_parameter { + my $result = &start_responseparam(@_); + return $result; +} + +sub end_parameter { + my $result = &end_responseparam(@_); + return $result; +} + +sub reset_params { + %Apache::inputtags::params=(); +} + sub setup_params { my ($tag) = @_; - @Apache::inputtags::params=(); + if ($ENV{'request.state'} eq 'construct') { return; } my %paramlist=(); foreach my $key (keys(%Apache::lonnet::packagetab)) { if ($key =~ /^$tag/) { @@ -352,7 +362,7 @@ sub setup_params { sub answer_header { my ($type) = @_; my $result; - if ($type eq 'optionresponse') { + if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) { $result = ''."\n"; } else { @@ -365,7 +375,7 @@ sub answer_header { sub answer_part { my ($type,$answer) = @_; my $result; - if ($type eq 'optionresponse') { + if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') { $result = ''; } else { $result = ''; @@ -376,7 +386,7 @@ sub answer_part { sub answer_footer { my ($type) = @_; my $result; - if ($type eq 'optionresponse') { + if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') { $result = '
Answer for Part:'. $Apache::inputtags::part. '
'.$answer.''.$answer.'
'; } else { $result = ''; @@ -384,6 +394,37 @@ sub answer_footer { return $result; } +sub showallfoils { + my $return=0; + if (defined($ENV{'form.showallfoils'}) && + $ENV{'request.state'} eq 'construct') { + $return=1; + } + return $return; +} + +sub getresponse { + my ($temp)=@_; + my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1']; + my $response; + if (!defined($temp)) { + $temp=1; + } else { + $formparm.=":$temp"; + } + my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7, + 'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14, + 'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, + 'W'=>22,'X'=>23,'Y'=>24,'Z'=>25); + if ($ENV{'form.submitted'} eq 'scantron') { + $response = $ENV{'scantron.'.($Apache::lonxml::counter+$temp-1). + '.answer'}; + $response = $let_to_num{$response}; + } else { + $response = $ENV{$formparm}; + } + return $response; +} 1; __END__