--- loncom/homework/response.pm 2003/04/30 21:19:13 1.73
+++ loncom/homework/response.pm 2005/03/28 11:57:48 1.115
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.73 2003/04/30 21:19:13 albertel Exp $
+# $Id: response.pm,v 1.115 2005/03/28 11:57:48 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,12 +25,10 @@
#
# http://www.lon-capa.org/
#
-# 11/23,11/24,11/28 Gerd Kortemeyer
-# Guy Albertelli
-# 08/04,08/07 Gerd Kortemeyer
package Apache::response;
use strict;
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse'));
@@ -48,11 +46,22 @@ 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;
}
sub end_response {
- pop @Apache::inputtags::response;
+ #pop @Apache::inputtags::response;
@Apache::inputtags::inputlist=();
return '';
}
@@ -62,6 +71,7 @@ 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::responselist,$id);
push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]);
return $id;
}
@@ -75,27 +85,74 @@ 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
-sub setrandomnumber {
- my $rndseed;
- if ($ENV{'request.state'} eq "construct") {
- $rndseed=$ENV{'form.rndseed'};
- if (!$rndseed) { $rndseed=time; }
+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 ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
+ 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);
- $rndseed=$rndseed
- +(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
- if (defined($Apache::inputtags::response['-1'])) {
- $rndseed=$rndseed
- +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
+ 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]);
+ }
+ } elsif ($rand_alg eq '64bit3') {
+ $rndmod=(&Apache::lonnet::numval2($Apache::inputtags::part) << 10);
+ if (defined($Apache::inputtags::response[-1])) {
+ $rndmod+=&Apache::lonnet::numval2($Apache::inputtags::response[-1]);
+ }
+ } else {
+ my $shift=(4*scalar(@Apache::inputtags::responselist))%30;
+ $rndmod=(&Apache::lonnet::numval3($Apache::inputtags::part) << (($shift+15)%30));
+ if (defined($Apache::inputtags::response[-1])) {
+ $rndmod+=(&Apache::lonnet::numval3($Apache::inputtags::response[-1]) << $shift );
+ }
}
- &Math::Random::random_set_seed_from_phrase($rndseed);
- &Apache::lonxml::debug("randseed $rndseed");
+ if ($rndseed =~/([,:])/) {
+ my $char=$1;
+ use integer;
+ my ($num1,$num2)=split(/\Q$char\E/,$rndseed);
+ $num1+=$rndmod;
+ $num2+=$rndmod;
+ if($Apache::lonnet::_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
+ $rndseed=$num1.$char.$num2;
+ } else {
+ $rndseed+=$rndmod;
+ if($Apache::lonnet::_64bit) {
+ use integer;
+ $rndseed=(($rndseed<<32)>>32);
+ }
+ }
+ &Apache::lonxml::debug("randseed $rndmod $rndseed");
+ &Apache::lonnet::setup_random_from_rndseed($rndseed);
return '';
}
@@ -109,8 +166,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;
@@ -171,12 +228,29 @@ sub mandatory_part_meta {
#
}
+sub meta_part_order {
+ if (@Apache::inputtags::partlist) {
+ my @parts=@Apache::inputtags::partlist;
+ shift(@parts);
+ return '<partorder>'.join(',',@parts).'</partorder>'."\n";
+ } else {
+ return '<partorder>0</partorder>'."\n";
+ }
+}
+
+sub meta_response_order {
+ if (@Apache::inputtags::responselist) {
+ return '<responseorder>'.join(',',@Apache::inputtags::responselist).
+ '</responseorder>'."\n";
+ }
+}
+
sub check_for_previous {
my ($curresponse,$partid,$id) = @_;
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) {
@@ -205,10 +279,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'});
}
}
@@ -250,7 +325,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};
@@ -269,6 +344,24 @@ sub end_dataresponse {
return $result;
}
+sub decide_package {
+ my ($tagstack)=@_;
+ my $package;
+ if ($$tagstack[-1] eq 'parameter') {
+ $package='part';
+ } else {
+ my $i=-1;
+ while (defined($$tagstack[$i])) {
+ if ($$tagstack[$i] =~ /(response|hint)$/) {
+ $package=$$tagstack[$i];
+ last;
+ }
+ $i--;
+ }
+ }
+ return $package;
+}
+
sub start_responseparam {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
@@ -279,6 +372,19 @@ sub start_responseparam {
$token->[2]->{'description'});
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
+ my $optionlist;
+ my $package=&decide_package($tagstack);
+ foreach my $key (sort(keys(%Apache::lonnet::packagetab))) {
+ if ($key =~ /^\Q$package\E&(.*)&display$/) {
+ $optionlist.='<option value="'.$1.'">'.
+ $Apache::lonnet::packagetab{$key}.'</option>';
+ }
+ }
+ if (defined($optionlist)) {
+ $result.='Use template: <select name="'.
+ &Apache::edit::html_element_name('parameter_package').'">'.
+ '<option value=""></option>'.$optionlist.'</select><br />';
+ }
$result.=&Apache::edit::text_arg('Name:','name',$token).
&Apache::edit::text_arg('Type:','type',$token).
&Apache::edit::text_arg('Description:','description',$token).
@@ -286,9 +392,22 @@ sub start_responseparam {
"</td></tr>";
$result.=&Apache::edit::end_table;
} elsif ($target eq 'modified') {
- my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
- 'name','type','description',
- 'default');
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'name','type',
+ 'description','default');
+ my $element=&Apache::edit::html_element_name('parameter_package');
+ if (defined($ENV{"form.$element"}) && $ENV{"form.$element"} ne '') {
+ my $name=$ENV{"form.$element"};
+ my $tag=&decide_package($tagstack);
+ $token->[2]->{'name'}=$name;
+ $token->[2]->{'type'}=
+ $Apache::lonnet::packagetab{"$tag&$name&type"};
+ $token->[2]->{'description'}=
+ $Apache::lonnet::packagetab{"$tag&$name&display"};
+ $token->[2]->{'default'}=
+ $Apache::lonnet::packagetab{"$tag&$name&default"};
+ $constructtag=1;
+ }
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::handle_insert();
@@ -312,13 +431,11 @@ sub end_responseparam {
}
sub start_parameter {
- my $result = &start_responseparam(@_);
- return $result;
+ return &start_responseparam(@_);
}
sub end_parameter {
- my $result = &end_responseparam(@_);
- return $result;
+ return &end_responseparam(@_);
}
sub reset_params {
@@ -326,7 +443,7 @@ sub reset_params {
}
sub setup_params {
- my ($tag) = @_;
+ my ($tag,$safeeval) = @_;
if ($ENV{'request.state'} eq 'construct') { return; }
my %paramlist=();
@@ -349,7 +466,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;
}
}
@@ -358,9 +477,9 @@ sub setup_params {
sub answer_header {
my ($type) = @_;
my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
- $result = '<table border="1"><tr><th>Answer for Part:'.
- $Apache::inputtags::part. '</th></tr><tr>'."\n";
+ if ($ENV{'form.answer_output_mode'} eq 'tex') {
+ $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: \verb|'.
+ $Apache::inputtags::part.'| \\\\ \hline ';
} else {
$result = '<table border="1"><tr><td>Answer for Part:'.
$Apache::inputtags::part. '</td>'."\n";
@@ -371,8 +490,8 @@ sub answer_header {
sub answer_part {
my ($type,$answer) = @_;
my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
- $result = '<td>'.$answer.'</td>';
+ if ($ENV{'form.answer_output_mode'} eq 'tex') {
+ $result = ' \verb|'.$answer.'|\\\\ \hline ';
} else {
$result = '<td>'.$answer.'</td>';
}
@@ -382,8 +501,8 @@ sub answer_part {
sub answer_footer {
my ($type) = @_;
my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
- $result = '</tr></table>';
+ if ($ENV{'form.answer_output_mode'} eq 'tex') {
+ $result = ' \end{tabular} \vskip 0 mm ';
} else {
$result = '</tr></table>';
}
@@ -391,16 +510,20 @@ 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 '') ||
+ ($ENV{'print.showallfoils'}) ) {
+ 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)) {
@@ -420,7 +543,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};
}
@@ -444,6 +573,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"}=
@@ -451,6 +581,152 @@ sub scored_response {
return $repetition;
}
+sub whichorder {
+ my ($max,$randomize,$showall,$hash)=@_;
+ #&Apache::lonxml::debug("man $max randomize $randomize");
+ if (!defined(@{ $$hash{'names'} })) { return; }
+ my @names = @{ $$hash{'names'} };
+ my @whichopt =();
+ my (%top,@toplist,%bottom,@bottomlist);
+ if (!($showall || ($randomize eq 'no'))) {
+ my $current=0;
+ foreach my $name (@names) {
+ $current++;
+ if ($$hash{"$name.location"} eq 'top') {
+ $top{$name}=$current;
+ } elsif ($$hash{"$name.location"} eq 'bottom') {
+ $bottom{$name}=$current;
+ }
+ }
+ }
+ my $topcount=0;
+ my $bottomcount=0;
+ while (((scalar(@whichopt)+$topcount+$bottomcount) < $max || $showall)
+ && ($#names > -1)) {
+ #&Apache::lonxml::debug("Have $#whichopt max is $max");
+ my $aopt;
+ if ($showall || ($randomize eq 'no')) {
+ $aopt=0;
+ } else {
+ $aopt=int(&Math::Random::random_uniform() * ($#names+1));
+ }
+ #&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
+ $aopt=splice(@names,$aopt,1);
+ #&Apache::lonxml::debug("Picked $aopt");
+ if ($top{$aopt}) {
+ $toplist[$top{$aopt}]=$aopt;
+ $topcount++;
+ } elsif ($bottom{$aopt}) {
+ $bottomlist[$bottom{$aopt}]=$aopt;
+ $bottomcount++;
+ } else {
+ push (@whichopt,$aopt);
+ }
+ }
+ for (my $i=0;$i<=$#toplist;$i++) {
+ if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
+ }
+ for (my $i=0;$i<=$#bottomlist;$i++) {
+ if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
+ }
+ return @whichopt;
+}
+
+sub show_answer {
+ my $part = $Apache::inputtags::part;
+ my $award = $Apache::lonhomework::history{"resource.$part.solved"};
+ my $status = $Apache::inputtags::status[-1];
+ return ( ($award =~ /^correct/
+ && lc($Apache::lonhomework::problemstatus) ne 'no')
+ || $status eq "SHOW_ANSWER");
+}
+
+sub analyze_store_foilgroup {
+ my ($shown,$attrs)=@_;
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
+ if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
+ push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
+ foreach my $attr (@$attrs) {
+ $Apache::lonhomework::analyze{"$part_id.foil.".$attr.".$name"} =
+ $Apache::response::foilgroup{"$name.".$attr};
+ }
+ }
+ 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; }
+ my @names = @{ $Apache::response::conceptgroup{'names'} };
+ my $pick=int(&Math::Random::random_uniform() * ($#names+1));
+ my $name=$names[$pick];
+ push @{ $Apache::response::foilgroup{'names'} }, $name;
+ foreach my $attr (@$attrs) {
+ $Apache::response::foilgroup{"$name.".$attr} =
+ $Apache::response::conceptgroup{"$name.".$attr};
+ }
+ my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+ $Apache::response::foilgroup{"$name.concept"} = $concept;
+ &Apache::lonxml::debug("Selecting $name in $concept");
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ if ($target eq 'analyze') {
+ push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} },
+ $concept);
+ $Apache::lonhomework::analyze{"$part_id.concept.$concept"}=
+ $Apache::response::conceptgroup{'names'};
+ foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) {
+ push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },
+ $name);
+ foreach my $attr (@$attrs) {
+ $Apache::lonhomework::analyze{"$part_id.foil.$attr.$name"}=
+ $Apache::response::conceptgroup{"$name.$attr"};
+ }
+ }
+ }
+ push(@{ $hinthash->{"$part_id.concepts"} },$concept);
+ $hinthash->{"$part_id.concept.$concept"}=
+ $Apache::response::conceptgroup{'names'};
+
+}
+
+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;
+}
+
+sub submitted {
+ my ($who)=@_;
+
+ # when scatron grading any submission is a submission
+ if ($ENV{'form.submitted'} eq 'scantron') { return 1; }
+ # if the caller only cared if this was a scantron submission
+ if ($who eq 'scantron') { return 0; }
+ # if the Submit Answer button for this particular part was pressed
+ my $partid=$Apache::inputtags::part;
+ if (defined($ENV{'form.submit_'.$partid})) { return 1; }
+ # otherwise no submission occured
+ return 0;
+}
1;
__END__