--- loncom/homework/response.pm 2003/04/30 21:19:13 1.73
+++ loncom/homework/response.pm 2003/05/13 15:27:01 1.75
@@ -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.75 2003/05/13 15:27:01 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -83,18 +83,23 @@ sub setrandomnumber {
$rndseed=$ENV{'form.rndseed'};
if (!$rndseed) { $rndseed=time; }
} else {
- my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
+ $rndseed=&Apache::lonnet::rndseed();
}
&Apache::lonxml::debug("randseed $rndseed");
# $rndseed=unpack("%32i",$rndseed);
- $rndseed=$rndseed
- +(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
+ my $rndmod=(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
if (defined($Apache::inputtags::response['-1'])) {
- $rndseed=$rndseed
- +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
+ $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);
}
- &Math::Random::random_set_seed_from_phrase($rndseed);
+ if ($rndseed =~/,/) {
+ my ($num1,$num2)=split(/,/,$rndseed);
+ $num1+=$rndmod;
+ $num2+=$rndmod;
+ $rndseed="$num1,$num2";
+ } else {
+ $rndseed+=$rndmod;
+ }
+ &Apache::lonnet::setup_random_from_rndseed($rndseed);
&Apache::lonxml::debug("randseed $rndseed");
return '';
}
@@ -358,12 +363,17 @@ sub setup_params {
sub answer_header {
my ($type) = @_;
my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
- $result = '
Answer for Part:'.
- $Apache::inputtags::part. ' |
---|
'."\n";
+ if ($ENV{'form.print_answer'} eq 'yes') {
+ $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: '.
+ $Apache::inputtags::part.' \\\\ \hline ';
} else {
- $result = 'Answer for Part:'.
- $Apache::inputtags::part. ' | '."\n";
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
+ $result = 'Answer for Part:'.
+ $Apache::inputtags::part. ' |
---|
'."\n";
+ } else {
+ $result = 'Answer for Part:'.
+ $Apache::inputtags::part. ' | '."\n";
+ }
}
return $result;
}
@@ -371,10 +381,14 @@ sub answer_header {
sub answer_part {
my ($type,$answer) = @_;
my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
- $result = ''.$answer.' | ';
+ if ($ENV{'form.print_answer'} eq 'yes') {
+ $result = ' '.$answer.'\\\\ \hline ';
} else {
- $result = ''.$answer.' | ';
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+ $result = ''.$answer.' | ';
+ } else {
+ $result = ''.$answer.' | ';
+ }
}
return $result;
}
@@ -382,10 +396,14 @@ sub answer_part {
sub answer_footer {
my ($type) = @_;
my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
- $result = '
';
+ if ($ENV{'form.print_answer'} eq 'yes') {
+ $result = ' \end{tabular} \vskip 0 mm ';
} else {
- $result = '
';
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+ $result = '
';
+ } else {
+ $result = '
';
+ }
}
return $result;
}