--- loncom/homework/response.pm 2004/11/06 21:30:35 1.105.2.1 +++ 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.105.2.1 2004/11/06 21:30:35 albertel Exp $ +# $Id: response.pm,v 1.108 2004/10/21 06:33:37 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -136,17 +136,12 @@ sub setrandomnumber { 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 $rndseed"); &Apache::lonnet::setup_random_from_rndseed($rndseed); + &Apache::lonxml::debug("randseed $rndseed"); return ''; } @@ -273,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'}); } } @@ -512,6 +508,7 @@ sub showallfoils { return 1; } } + if ($Apache::lonhomework::type eq 'survey') { return 1; } return 0; } @@ -651,7 +648,7 @@ sub analyze_store_foilgroup { sub check_if_computed { my ($token,$parstack,$safeeval,$name)=@_; my $value = &Apache::lonxml::get_param($name,$parstack,$safeeval); - if ($value ne $token->[2]{$name}) { + 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; }