--- loncom/homework/response.pm 2001/10/01 20:18:31 1.49
+++ loncom/homework/response.pm 2002/10/08 18:04:04 1.65
@@ -1,6 +1,30 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
-
+#
+# $Id: response.pm,v 1.65 2002/10/08 18:04:04 bowersj2 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# 11/23,11/24,11/28 Gerd Kortemeyer
# Guy Albertelli
# 08/04,08/07 Gerd Kortemeyer
@@ -8,14 +32,19 @@
package Apache::response;
use strict;
-sub BEGIN {
- &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse'));
+BEGIN {
+ &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse'));
}
sub start_response {
my ($parstack,$safeeval)=@_;
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+ if ($#Apache::inputtags::import > -1) {
+ &Apache::lonxml::debug("Turning :$id: into");
+ $id = join('_',@Apache::inputtags::import).'_'.$id;
+ &Apache::lonxml::debug("New :$id:");
+ }
push (@Apache::inputtags::response,$id);
push (@Apache::inputtags::responselist,$id);
@Apache::inputtags::inputlist=();
@@ -33,11 +62,13 @@ 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::paramstack,[%Apache::inputtags::params]);
return $id;
}
sub end_hintresponse {
pop @Apache::inputtags::response;
+ %Apache::inputtags::params=@{pop(@Apache::inputtags::paramstack)};
return '';
}
@@ -49,7 +80,8 @@ sub setrandomnumber {
$rndseed=$ENV{'form.rndseed'};
if (!$rndseed) { $rndseed=time; }
} else {
- $rndseed=&Apache::lonnet::rndseed();
+ my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
}
&Apache::lonxml::debug("randseed $rndseed");
# $rndseed=unpack("%32i",$rndseed);
@@ -59,7 +91,7 @@ sub setrandomnumber {
$rndseed=$rndseed
+&Apache::lonnet::numval($Apache::inputtags::response['-1']);
}
- srand($rndseed);
+ &Math::Random::random_set_seed_from_phrase($rndseed);
&Apache::lonxml::debug("randseed $rndseed");
return '';
}
@@ -164,62 +196,15 @@ sub check_for_previous {
return %previous;
}
-sub start_caparesponse {
- require Apache::caparesponse;
- import Apache::caparesponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-# print "\n
\nsimple caparesponse\n";
- return &Apache::caparesponse::start_caparesponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
-}
-
-sub start_stringresponse {
- require Apache::caparesponse;
- import Apache::caparesponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- return &Apache::caparesponse::start_stringresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
-}
-
-sub start_formularesponse {
- require Apache::caparesponse;
- import Apache::caparesponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- return &Apache::caparesponse::start_formularesponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
-}
-
-sub start_numericalresponse {
- require Apache::caparesponse;
- import Apache::caparesponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- return &Apache::caparesponse::start_numericalresponse
- ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
-}
-
-sub start_radiobuttonresponse {
- require Apache::radiobuttonresponse;
- import Apache::radiobuttonresponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- return &Apache::radiobuttonresponse::start_radiobuttonresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
-}
-
-sub start_optionresponse {
- require Apache::optionresponse;
- import Apache::optionresponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- return &Apache::optionresponse::start_optionresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
-}
-
-sub start_imageresponse {
- require Apache::imageresponse;
- import Apache::imageresponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- return &Apache::imageresponse::start_imageresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
-}
-
-sub start_essayresponse {
- require Apache::essayresponse;
- import Apache::essayresponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- return &Apache::essayresponse::start_essayresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
+sub handle_previous {
+ my ($previous,$ad)=@_;
+ if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) {
+ if ($$previous{'last'}) {
+ push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
+ } else {
+ push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
+ }
+ }
}
sub view_or_modify {
@@ -293,8 +278,7 @@ sub start_responseparam {
$token->[2]->{'default'},
$token->[2]->{'description'});
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::tag_start($target,$token,
- &Apache::lonxml::description($token));
+ $result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Name:','name',$token).
&Apache::edit::text_arg('Type:','type',$token).
&Apache::edit::text_arg('Description:','description',$token).
@@ -309,6 +293,13 @@ sub start_responseparam {
$result = &Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::handle_insert();
}
+ } elsif ($target eq 'grade' || $target eq 'answer' ||
+ $target eq 'web' || $target eq 'tex') {
+ if ($ENV{'request.state'} eq 'construct') {
+ my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ my $default = &Apache::lonxml::get_param('default',$parstack,$safeeval);
+ if ($name) {$Apache::inputtags::params{$name}=$default;}
+ }
}
return $result;
}
@@ -319,10 +310,21 @@ sub end_responseparam {
return '';
}
+sub start_parameter {
+ my $result = &start_responseparam(@_);
+ return $result;
+}
+
+sub end_parameter {
+ my $result = &end_responseparam(@_);
+ return $result;
+}
+
sub setup_params {
my ($tag) = @_;
- @Apache::inputtags::params=();
+ if ($ENV{'request.state'} eq 'construct') { return; }
+ %Apache::inputtags::params=();
my %paramlist=();
foreach my $key (keys(%Apache::lonnet::packagetab)) {
if ($key =~ /^$tag/) {
@@ -352,7 +354,7 @@ sub setup_params {
sub answer_header {
my ($type) = @_;
my $result;
- if ($type eq 'optionresponse') {
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
$result = '
Answer for Part:'. $Apache::inputtags::part. ' | |
---|---|
'.$answer.' | '; } else { $result = ''.$answer.' | '; @@ -376,7 +378,7 @@ sub answer_part { sub answer_footer { my ($type) = @_; my $result; - if ($type eq 'optionresponse') { + if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') { $result = '