--- loncom/homework/response.pm 2001/12/04 14:53:18 1.52
+++ loncom/homework/response.pm 2002/11/27 19:25:56 1.68
@@ -1,6 +1,30 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
-
+#
+# $Id: response.pm,v 1.68 2002/11/27 19:25:56 albertel 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,8 +32,8 @@
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 {
@@ -38,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 '';
}
@@ -54,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);
@@ -64,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 '';
}
@@ -145,7 +172,7 @@ sub check_for_previous {
my ($curresponse,$partid,$id) = @_;
my %previous;
$previous{'used'} = 0;
- foreach my $key (reverse(sort(keys(%Apache::lonhomework::history)))) {
+ foreach my $key (sort(keys(%Apache::lonhomework::history))) {
if ($key =~ /resource\.$partid\.$id\.submission/) {
&Apache::lonxml::debug("Trying $key");
my $pastresponse=$Apache::lonhomework::history{$key};
@@ -156,75 +183,30 @@ sub check_for_previous {
$history=$1;
$previous{'award'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"};
$previous{'last'}='0';
+ push(@{ $previous{'version'} },$history);
} else {
$previous{'award'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"};
$previous{'last'}='1';
}
if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN'; }
&Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:");
- last;
}
}
}
+ &Apache::lonhomework::showhash(%previous);
return %previous;
}
-sub start_caparesponse {
- require Apache::caparesponse;
- import Apache::caparesponse;
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-# print "\n<br />\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');
+ }
+ push(@Apache::inputtags::previous_version,$$previous{'version'});
+ }
}
sub view_or_modify {
@@ -265,7 +247,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('datasubmission');
+ &Apache::response::setup_params('dataresponse');
my $partid = $Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
my $response = $ENV{'form.HWVAL'.$id};
@@ -298,8 +280,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).
@@ -314,11 +295,12 @@ sub start_responseparam {
$result = &Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::handle_insert();
}
- } elsif ($target eq 'grade') {
+ } elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' ||
+ $target eq 'tex' || $target eq 'analyze' ) {
if ($ENV{'request.state'} eq 'construct') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
my $default = &Apache::lonxml::get_param('default',$parstack,$safeeval);
- $Apache::inputtags::params{$name}=$default;
+ if ($name) {$Apache::inputtags::params{$name}=$default;}
}
}
return $result;
@@ -330,11 +312,24 @@ sub end_responseparam {
return '';
}
+sub start_parameter {
+ my $result = &start_responseparam(@_);
+ return $result;
+}
+
+sub end_parameter {
+ my $result = &end_responseparam(@_);
+ return $result;
+}
+
+sub reset_params {
+ %Apache::inputtags::params=();
+}
+
sub setup_params {
my ($tag) = @_;
if ($ENV{'request.state'} eq 'construct') { return; }
- @Apache::inputtags::params=();
my %paramlist=();
foreach my $key (keys(%Apache::lonnet::packagetab)) {
if ($key =~ /^$tag/) {
@@ -396,6 +391,14 @@ sub answer_footer {
return $result;
}
+sub showallfoils {
+ my $return=0;
+ if (defined($ENV{'form.showallfoils'}) &&
+ $ENV{'request.state'} eq 'construct') {
+ $return=1;
+ }
+ return $return;
+}
1;
__END__