--- loncom/homework/response.pm 2001/12/07 23:59:08 1.54
+++ loncom/homework/response.pm 2003/04/08 02:42:55 1.70
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.54 2001/12/07 23:59:08 albertel Exp $
+# $Id: response.pm,v 1.70 2003/04/08 02:42:55 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','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse'));
+BEGIN {
+ &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse'));
}
sub start_response {
@@ -62,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 '';
}
@@ -78,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);
@@ -88,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 '';
}
@@ -169,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};
@@ -180,16 +186,17 @@ 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;
}
@@ -201,67 +208,10 @@ sub handle_previous {
} else {
push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
}
+ push(@Apache::inputtags::previous_version,$$previous{'version'});
}
}
-sub start_caparesponse {
- require Apache::caparesponse;
- import Apache::caparesponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-# print "\n<br />\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 view_or_modify {
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
my $myself=0;
@@ -300,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"}=
@@ -333,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).
@@ -349,11 +298,12 @@ 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' || $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;
@@ -365,11 +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) = @_;
if ($ENV{'request.state'} eq 'construct') { return; }
- @Apache::inputtags::params=();
my %paramlist=();
foreach my $key (keys(%Apache::lonnet::packagetab)) {
if ($key =~ /^$tag/) {
@@ -431,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__