--- loncom/homework/response.pm 2009/03/06 16:13:29 1.211
+++ loncom/homework/response.pm 2011/09/13 21:42:58 1.226
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.211 2009/03/06 16:13:29 raeburn Exp $
+# $Id: response.pm,v 1.226 2011/09/13 21:42:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,7 +30,7 @@
=head1 NAME
-Apache::resonse.pm
+Apache::response.pm
=head1 SYNOPSIS
@@ -54,6 +54,7 @@ use strict;
use Apache::lonlocal;
use Apache::lonnet;
use Apache::lonmaxima();
+use Apache::lonr();
BEGIN {
&Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse'));
@@ -135,9 +136,10 @@ sub poprandomnumber {
}
sub setrandomnumber {
- my ($ignore_id2) = @_;
- my $rndseed;
- $rndseed=&Apache::structuretags::setup_rndseed();
+ my ($ignore_id2,$target,$rndseed) = @_;
+ if (!defined($rndseed)) {
+ $rndseed=&Apache::structuretags::setup_rndseed(undef,$target);
+ }
if (!defined($rndseed)) { $rndseed=&Apache::lonnet::rndseed(); }
&Apache::lonxml::debug("randseed $rndseed");
# $rndseed=unpack("%32i",$rndseed);
@@ -177,7 +179,7 @@ sub setrandomnumber {
} else {
($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2");
}
-
+ $Apache::lonhomework::results{'resource.'.$id1.'.rawrndseed'}=$rndseed;
if ($rndseed =~/([,:])/) {
my $char=$1;
use integer;
@@ -194,6 +196,7 @@ sub setrandomnumber {
}
}
&Apache::lonxml::debug("randseed $rndmod $rndseed");
+ $Apache::lonhomework::results{'resource.'.$id1.'.rndseed'}=$rndseed;
&Apache::lonnet::setup_random_from_rndseed($rndseed);
return '';
}
@@ -279,32 +282,51 @@ sub meta_response_order {
}
sub check_for_previous {
- my ($curresponse,$partid,$id,$last) = @_;
+ my ($curresponse,$partid,$id,$last,$type) = @_;
my %previous;
$previous{'used'} = 0;
+ my $questiontype = $Apache::lonhomework::type;
+ my $curr_rndseed = $env{'form.'.$partid.'.rndseed'};
foreach my $key (sort(keys(%Apache::lonhomework::history))) {
- if ($key =~ /resource\.$partid\.$id\.submission$/) {
+ if ($key =~ /resource\.\Q$partid\E\.\Q$id\E\.submission$/) {
if ( $last && $key =~ /^(\d+):/ ) {
next if ($1 >= $last);
}
&Apache::lonxml::debug("Trying $key");
my $pastresponse=$Apache::lonhomework::history{$key};
if ($pastresponse eq $curresponse) {
- $previous{'used'} = 1;
my $history;
if ( $key =~ /^(\d+):/ ) {
- $history=$1;
+ $history=$1;
+ next if ((($questiontype eq 'randomizetry') ||
+ ($Apache::lonhomework::history{"$history:resource.$partid.type"} eq 'randomizetry')) &&
+ ($curr_rndseed ne $Apache::lonhomework::history{"$history:resource.$partid.rndseed"}));
$previous{'award'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"};
$previous{'last'}='0';
push(@{ $previous{'version'} },$history);
} else {
+ next if ((($questiontype eq 'randomizetry') ||
+ ($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry')) &&
+ ($curr_rndseed ne $Apache::lonhomework::history{"resource.$partid.rndseed"}));
$previous{'award'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"};
$previous{'last'}='1';
}
+ $previous{'used'} = 1;
if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN'; }
if ($previous{'award'} eq 'INTERNAL_ERROR') { $previous{'used'}=0; }
&Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:");
- }
+ } elsif ($type eq 'ci') {
+ if (lc($pastresponse) eq lc($curresponse)) {
+ if ($key =~ /^(\d+):/) {
+ my $history = $1;
+ next if (($questiontype eq 'randomizetry') &&
+ ($curr_rndseed ne $Apache::lonhomework::history{"$history:resource.$partid.rndseed"}));
+ push (@{$previous{'versionci'}},$history);
+ $previous{'awardci'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"};
+ $previous{'usedci'} = 1;
+ }
+ }
+ }
}
}
&Apache::lonhomework::showhash(%previous);
@@ -317,7 +339,10 @@ sub handle_previous {
if ($$previous{'last'}) {
push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
push(@Apache::inputtags::previous_version,$$previous{'version'});
- } elsif ($Apache::lonhomework::type ne 'survey') {
+ } elsif (($Apache::lonhomework::type ne 'survey') &&
+ ($Apache::lonhomework::type ne 'surveycred') &&
+ ($Apache::lonhomework::type ne 'anonsurvey') &&
+ ($Apache::lonhomework::type ne 'anonsurveycred')) {
push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
push(@Apache::inputtags::previous_version,$$previous{'version'});
}
@@ -398,7 +423,7 @@ sub start_customresponse {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('String to display for answer:',
- 'answerdisplay',$token);
+ 'answerdisplay',$token,'50');
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag;
@@ -438,7 +463,7 @@ sub end_customresponse {
${$safeeval->varglob('LONCAPA::customresponse_submission')}=
$response;
- my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
+ my ($award,$score) = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
if (!&Apache::inputtags::valid_award($award)) {
$error = $award;
$award = 'ERROR';
@@ -446,6 +471,9 @@ sub end_customresponse {
&Apache::response::handle_previous(\%previous,$award);
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
$award;
+ if ($award eq 'ASSIGNED_SCORE') {
+ $Apache::lonhomework::results{"resource.$part.$id.awarded"}=1.0*$score;
+ }
if ($error) {
$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=
$error;
@@ -505,10 +533,10 @@ sub start_mathresponse {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('String to display for answer:',
- 'answerdisplay',$token);
+ 'answerdisplay',$token,'50');
$result.=&Apache::edit::select_arg('Algebra System:',
'cas',
- ['maxima'],
+ ['maxima','R'],
$token);
$result.=&Apache::edit::text_arg('Argument Array:',
'args',$token).
@@ -538,14 +566,14 @@ sub edit_mathresponse_button {
# my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
return(<<ENDFORMULABUTTON);
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
function edit_${id}_${field} (textarea) {
thenumber = textarea;
thedata = document.forms['lonhomework'].elements[textarea].value;
newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
}
</script>
-<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$button' title='$button'/></a>
+<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src="$iconpath/stift.gif" alt="$button" title="$button" /></a>
ENDFORMULABUTTON
}
@@ -572,6 +600,12 @@ sub end_mathresponse {
$award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args,
&Apache::lonxml::get_param('libraries',$parstack,$safeeval));
}
+ if ($cas eq 'R') {
+ my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
+ $award=&Apache::lonr::r_run($Apache::response::custom_answer[-1],$response,$args,
+ &Apache::lonxml::get_param('libraries',$parstack,$safeeval));
+ }
+
if (!&Apache::inputtags::valid_award($award)) {
$error = $award;
$award = 'ERROR';
@@ -897,6 +931,10 @@ sub showallfoils {
}
}
if ($Apache::lonhomework::type eq 'survey') { return 1; }
+ if ($Apache::lonhomework::type eq 'surveycred') { return 1; }
+ if ($Apache::lonhomework::type eq 'anonsurvey') { return 1; }
+ if ($Apache::lonhomework::type eq 'anonsurveycred') { return 1; }
+
return 0;
}
@@ -965,16 +1003,18 @@ sub getresponse {
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
$response;
if ($resulttype ne 'letter') {
- if ($resulttype eq 'A is 1') {
- $response = $let_to_num{$response}+1;
- } else {
- $response = $let_to_num{$response};
+ $response = $let_to_num{$response};
+ if ($resulttype eq 'A is 1') {
+ if ($response ne "") {
+ $response = $response+1;
+ }
}
if ($response ne "") {
$response += $line * $bubbles_per_line;
}
} else {
if ($response ne "") {
+ my $raw = $response;
$response = chr(ord($response) + $line * $bubbles_per_line);
}
}
@@ -995,7 +1035,10 @@ sub getresponse {
=item &repetition();
Returns the number of lines that are required to encode the weight.
-(Currently expects that there are 10 bubbles per line)
+(Default is for 10 bubbles per bubblesheet item; other (integer)
+values can be specified by using a custom Bubblesheet format file
+with an eighteenth entry (BubblesPerRow) set to the integer
+appropriate for the bubblesheets which will be used to assign weights.
=cut
@@ -1003,8 +1046,15 @@ sub repetition {
my $id = $Apache::inputtags::part;
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
if (!defined($weight) || ($weight eq '')) { $weight=1; }
- my $repetition = int($weight/10);
- if ($weight % 10 != 0) { $repetition++; }
+ my $bubbles_per_row;
+ if (($env{'form.bubbles_per_row'} =~ /^\d+$/) &&
+ ($env{'form.bubbles_per_row'} > 0)) {
+ $bubbles_per_row = $env{'form.bubbles_per_row'};
+ } else {
+ $bubbles_per_row = 10;
+ }
+ my $repetition = int($weight/$bubbles_per_row);
+ if ($weight % $bubbles_per_row != 0) { $repetition++; }
return $repetition;
}
@@ -1051,7 +1101,7 @@ sub scored_response {
}
sub whichorder {
- my ($max,$randomize,$showall,$hash)=@_;
+ my ($max,$randomize,$showall,$hash,$rndseed)=@_;
#&Apache::lonxml::debug("man $max randomize $randomize");
if (!defined(@{ $$hash{'names'} })) { return; }
my @names = @{ $$hash{'names'} };
@@ -1103,9 +1153,9 @@ sub whichorder {
sub show_answer {
my $part = $Apache::inputtags::part;
- my $award = $Apache::lonhomework::history{"resource.$part.solved"};
+ my $award = $Apache::lonhomework::history{"resource.$part.awarded"};
my $status = $Apache::inputtags::status[-1];
- return ( ($award =~ /^correct/
+ return ( ($award ==1
&& &Apache::lonhomework::show_problem_status())
|| $status eq "SHOW_ANSWER");
}
@@ -1291,25 +1341,40 @@ sub check_status {
- scalars that are other elements of the history hash to pass to $func
- ref to data to be passed untouched to $func
+ $questiontype is the questiontype (currently only passed in if
+ randomizebytry.
+
=cut
sub setup_prior_tries_hash {
- my ($func,$data) = @_;
+ my ($func,$data,$questiontype) = @_;
my $part = $Apache::inputtags::part;
- my $id = $Apache::inputtags::response[-1];
+ my $id = $Apache::inputtags::response[-1];
foreach my $i (1..$Apache::lonhomework::history{'version'}) {
- my $sub_key = "$i:resource.$part.$id.submission";
+ my $partprefix = "$i:resource.$part";
+ my $sub_key = "$partprefix.$id.submission";
next if (!exists($Apache::lonhomework::history{$sub_key}));
+ my $type_key = "$partprefix.type";
+ my $type = $Apache::lonhomework::history{$type_key};
my @other_data;
- foreach my $datum (@{ $data }) {
- if (ref($datum)) {
- push(@other_data,$datum);
- } else {
- my $info_key = "$i:resource.$part.$id.$datum";
- push(@other_data,$Apache::lonhomework::history{$info_key});
+ if (ref($data) eq 'ARRAY') {
+ foreach my $datum (@{ $data }) {
+ if (ref($datum)) {
+ push(@other_data,$datum);
+ } else {
+ my $info_key = "$i:resource.$part.$id.$datum";
+ push(@other_data,$Apache::lonhomework::history{$info_key});
+ }
}
- }
-
+ }
+ if ($questiontype eq 'randomizetry') {
+ my $order_key = "$partprefix.$id.foilorder";
+ my @whichopts = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key});
+ if (@whichopts > 0) {
+ shift(@other_data);
+ unshift(@other_data,\@whichopts);
+ }
+ }
my $output =
&$func('grade',
$Apache::lonhomework::history{$sub_key},