[LON-CAPA-cvs] cvs: loncom /homework response.pm
www
lon-capa-cvs@mail.lon-capa.org
Mon, 19 Jun 2006 16:32:38 -0000
www Mon Jun 19 12:32:38 2006 EDT
Modified files:
/loncom/homework response.pm
Log:
Model <mathresponse> after <customresponse>
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.139 loncom/homework/response.pm:1.140
--- loncom/homework/response.pm:1.139 Mon Jun 19 12:15:53 2006
+++ loncom/homework/response.pm Mon Jun 19 12:32:35 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.139 2006/06/19 16:15:53 www Exp $
+# $Id: response.pm,v 1.140 2006/06/19 16:32:35 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -434,23 +434,82 @@
return $result;
}
+
sub start_mathresponse {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $id = &Apache::response::start_response($parstack,$safeeval);
+ push(@Apache::lonxml::namespace,'mathresponse');
my $result;
- if ($target eq 'meta') {
- &Apache::response::start_response($parstack,$safeeval);
- $result=&Apache::response::meta_package_write('mathresponse');
- &Apache::response::end_response();
- } else {
-# $result.=&start_numericalresponse(@_);
+ undef($Apache::response::custom_answer);
+ &Apache::lonxml::register('Apache::response',('answer'));
+ if ($target eq 'web') {
+ if ( &Apache::response::show_answer() ) {
+ my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
+ $safeeval);
+ $Apache::inputtags::answertxt{$id}=$answer;
+ }
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::text_arg('String to display for answer:',
+ 'answerdisplay',$token);
+ $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag;
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'answerdisplay');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ $result.=&Apache::edit::handle_insert();
+ }
+ } elsif ($target eq 'answer' || $target eq 'grade') {
+ &Apache::response::reset_params();
+ } elsif ($target eq 'meta') {
+ $result .= &Apache::response::meta_package_write('mathresponse');
}
return $result;
}
sub end_mathresponse {
-# return end_numericalresponse(@_);
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ my $part=$Apache::inputtags::part;
+ my $id=$Apache::inputtags::response[-1];
+ if ( $target eq 'grade' && &Apache::response::submitted() ) {
+ my $response = &Apache::response::getresponse();
+ if ( $response =~ /[^\s]/ &&
+ $Apache::response::custom_answer_type eq 'loncapa/perl') {
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ my %previous = &Apache::response::check_for_previous($response,
+ $part,$id);
+ $Apache::lonhomework::results{"resource.$part.$id.submission"}=
+ $response;
+ my $error;
+ ${$safeeval->varglob('LONCAPA::mathresponse_submission')}=
+ $response;
+
+ my $award = &Apache::run::run('{ my $submission=$LONCAPA::mathresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval);
+ if (!&Apache::inputtags::valid_award($award)) {
+ $error = $award;
+ $award = 'ERROR';
+ }
+ &Apache::response::handle_previous(\%previous,$award);
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
+ $award;
+ if ($error) {
+ $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=
+ $error;
+ }
+ }
+ }
+ pop(@Apache::lonxml::namespace);
+ &Apache::lonxml::deregister('Apache::response',('answer'));
+ &Apache::response::end_response();
+ return $result;
}
+
sub start_answer {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;