--- loncom/homework/response.pm 2003/11/03 21:47:21 1.88
+++ loncom/homework/response.pm 2004/10/21 06:33:37 1.108
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.88 2003/11/03 21:47:21 albertel Exp $
+# $Id: response.pm,v 1.108 2004/10/21 06:33:37 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,6 +28,7 @@
package Apache::response;
use strict;
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse'));
@@ -45,6 +46,17 @@ sub start_response {
push (@Apache::inputtags::response,$id);
push (@Apache::inputtags::responselist,$id);
@Apache::inputtags::inputlist=();
+ if ($Apache::inputtags::part eq '' &&
+ !$Apache::lonhomework::ignore_response_errors) {
+ &Apache::lonxml::error(&HTML::Entities::encode(&mt("Found a <*response> outside of a <part> in a <part>ed problem"),'<>&"'));
+ }
+ if ($Apache::inputtags::response_with_no_part &&
+ $Apache::inputtags::part ne '0') {
+ &Apache::lonxml::error(&HTML::Entities::encode(&mt("<*response>s are both inside of <part> and outside of <part>, this is not a valid problem, errors in grading may occur."),'<>&"').'<br />');
+ }
+ if ($Apache::inputtags::part eq '0') {
+ $Apache::inputtags::response_with_no_part=1;
+ }
return $id;
}
@@ -73,27 +85,59 @@ sub end_hintresponse {
return '';
}
-# used by response to set the non-safe space random number generator to something
-# that is stable and unique based on the part number and response number
+my @randomseeds;
+sub pushrandomnumber {
+ my $rand_alg=&Apache::lonnet::get_rand_alg();
+ if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
+ $rand_alg eq '64bit2') {
+ # do nothing
+ } else {
+ my @seed=&Math::Random::random_get_seed();
+ push (@randomseeds,\@seed);
+ }
+ &Apache::response::setrandomnumber();
+}
+sub poprandomnumber {
+ my $rand_alg=&Apache::lonnet::get_rand_alg();
+ if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
+ $rand_alg eq '64bit2') {
+ return;
+ }
+ my $seed=pop(@randomseeds);
+ if ($seed) {
+ &Math::Random::random_set_seed(@$seed);
+ } else {
+ &Apache::lonxml::error("Unable to restore random algorithm.");
+ }
+}
sub setrandomnumber {
my $rndseed;
$rndseed=&Apache::structuretags::setup_rndseed();
if (!defined($rndseed)) { $rndseed=&Apache::lonnet::rndseed(); }
&Apache::lonxml::debug("randseed $rndseed");
# $rndseed=unpack("%32i",$rndseed);
- my $rndmod=(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
- if (defined($Apache::inputtags::response['-1'])) {
- $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);
- }
- if ($rndseed =~/,/) {
- {
- use integer;
- my ($num1,$num2)=split(/,/,$rndseed);
- $num1+=$rndmod;
- $num2+=$rndmod;
- $rndseed="$num1,$num2";
+ my $rand_alg=&Apache::lonnet::get_rand_alg();
+ my $rndmod;
+ if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
+ $rand_alg eq '64bit2') {
+ $rndmod=(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
+ if (defined($Apache::inputtags::response[-1])) {
+ $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);
}
} else {
+ $rndmod=(&Apache::lonnet::numval2($Apache::inputtags::part) << 10);
+ if (defined($Apache::inputtags::response[-1])) {
+ $rndmod+=&Apache::lonnet::numval2($Apache::inputtags::response[-1]);
+ }
+ }
+ if ($rndseed =~/([,:])/) {
+ my $char=$1;
+ use integer;
+ my ($num1,$num2)=split(/\Q$char\E/,$rndseed);
+ $num1+=$rndmod;
+ $num2+=$rndmod;
+ $rndseed=$num1.$char.$num2;
+ } else {
$rndseed+=$rndmod;
}
&Apache::lonnet::setup_random_from_rndseed($rndseed);
@@ -111,8 +155,8 @@ sub meta_parameter_write {
}
$result.= ' name="'.$name.'"'.
' type="'.$type.'"'.
-($default?' default="'.$default.'"':'').
-($display?' display="'.$display.' [Part: '.$partref.']"':'')
+(defined($default)?' default="'.$default.'"':'').
+(defined($display)?' display="'.$display.' [Part: '.$partref.']"':'')
.'></parameter>'
."\n";
return $result;
@@ -177,9 +221,16 @@ sub meta_part_order {
if (@Apache::inputtags::partlist) {
my @parts=@Apache::inputtags::partlist;
shift(@parts);
- return '<partorder>'.join(',',@parts).'</partorder>';
+ return '<partorder>'.join(',',@parts).'</partorder>'."\n";
} else {
- return '<partorder>0</partorder>';
+ return '<partorder>0</partorder>'."\n";
+ }
+}
+
+sub meta_response_order {
+ if (@Apache::inputtags::responselist) {
+ return '<responseorder>'.join(',',@Apache::inputtags::responselist).
+ '</responseorder>'."\n";
}
}
@@ -188,7 +239,7 @@ sub check_for_previous {
my %previous;
$previous{'used'} = 0;
foreach my $key (sort(keys(%Apache::lonhomework::history))) {
- if ($key =~ /resource\.$partid\.$id\.submission/) {
+ if ($key =~ /resource\.$partid\.$id\.submission$/) {
&Apache::lonxml::debug("Trying $key");
my $pastresponse=$Apache::lonhomework::history{$key};
if ($pastresponse eq $curresponse) {
@@ -217,10 +268,11 @@ sub handle_previous {
if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) {
if ($$previous{'last'}) {
push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
- } else {
+ push(@Apache::inputtags::previous_version,$$previous{'version'});
+ } elsif ($Apache::lonhomework::type ne 'survey') {
push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
+ push(@Apache::inputtags::previous_version,$$previous{'version'});
}
- push(@Apache::inputtags::previous_version,$$previous{'version'});
}
}
@@ -262,7 +314,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('dataresponse');
+ &Apache::response::setup_params('dataresponse',$safeeval);
my $partid = $Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
my $response = $ENV{'form.HWVAL_'.$id};
@@ -382,7 +434,7 @@ sub reset_params {
}
sub setup_params {
- my ($tag) = @_;
+ my ($tag,$safeeval) = @_;
if ($ENV{'request.state'} eq 'construct') { return; }
my %paramlist=();
@@ -405,7 +457,9 @@ sub setup_params {
&Apache::lonxml::debug("using nothing");
$Apache::inputtags::params{$key}='';
} else {
- &Apache::lonxml::debug("using value");
+ my $string="{return qq\0".$value."\0}";
+ my $newvalue=&Apache::run::run($string,$safeeval,1);
+ if (defined($newvalue)) { $value=$newvalue; }
$Apache::inputtags::params{$key}=$value;
}
}
@@ -447,16 +501,19 @@ sub answer_footer {
}
sub showallfoils {
- my $return=0;
- if (defined($ENV{'form.showallfoils'}) &&
- $ENV{'request.state'} eq 'construct') {
- $return=1;
+ if (defined($ENV{'form.showallfoils'})) {
+ my ($symb)=&Apache::lonxml::whichuser();
+ if ($ENV{'request.state'} eq 'construct' ||
+ ($ENV{'user.adv'} && $symb eq '')) {
+ return 1;
+ }
}
- return $return;
+ if ($Apache::lonhomework::type eq 'survey') { return 1; }
+ return 0;
}
sub getresponse {
- my ($temp)=@_;
+ my ($temp,$resulttype)=@_;
my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1'];
my $response;
if (!defined($temp)) {
@@ -476,7 +533,13 @@ sub getresponse {
# save bubbled letter for later
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
$response;
- $response = $let_to_num{$response};
+ if ($resulttype ne 'letter') {
+ if ($resulttype eq 'A is 1') {
+ $response = $let_to_num{$response}+1;
+ } else {
+ $response = $let_to_num{$response};
+ }
+ }
} else {
$response = $ENV{$formparm};
}
@@ -500,6 +563,7 @@ sub scored_response {
if ($increase ne '') { $score+=$increase+1; }
}
my $weight = &Apache::lonnet::EXT("resource.$part.weight");
+ if (!defined($weight) || $weight eq '' || $weight eq 0) { $weight = 1; }
my $pcr=$score/$weight;
$Apache::lonhomework::results{"resource.$part.$id.awarded"}=$pcr;
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
@@ -555,7 +619,6 @@ sub whichorder {
for (my $i=0;$i<=$#bottomlist;$i++) {
if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
}
-
return @whichopt;
}
@@ -582,6 +645,15 @@ sub analyze_store_foilgroup {
push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} }, @{ $shown });
}
+sub check_if_computed {
+ my ($token,$parstack,$safeeval,$name)=@_;
+ my $value = &Apache::lonxml::get_param($name,$parstack,$safeeval);
+ if (ref($token->[2]) eq 'HASH' && $value ne $token->[2]{$name}) {
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ $Apache::lonhomework::analyze{"$part_id.answercomputed"} = 1;
+ }
+}
+
sub pick_foil_for_concept {
my ($target,$attrs,$hinthash,$parstack,$safeeval)=@_;
if (not defined(@{ $Apache::response::conceptgroup{'names'} })) { return; }
@@ -617,6 +689,20 @@ sub pick_foil_for_concept {
}
+sub get_response_param {
+ my ($id,$name,$default)=@_;
+ my $parameter;
+ if ($ENV{'request.state'} eq 'construct' &&
+ defined($Apache::inputtags::params{$name})) {
+ $parameter=$Apache::inputtags::params{$name};
+ } else {
+ $parameter=&Apache::lonnet::EXT("resource.$id.$name");
+ }
+ if (!defined($parameter) || $parameter eq '') {
+ $parameter = $default;
+ }
+ return $parameter;
+}
1;
__END__