--- loncom/homework/response.pm 2006/03/08 22:17:17 1.137
+++ loncom/homework/response.pm 2006/12/04 21:23:01 1.152
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.137 2006/03/08 22:17:17 albertel Exp $
+# $Id: response.pm,v 1.152 2006/12/04 21:23:01 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,7 +32,7 @@ use Apache::lonlocal;
use Apache::lonnet;
BEGIN {
- &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse'));
+ &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse'));
}
sub start_response {
@@ -128,11 +128,13 @@ sub setrandomnumber {
}
$shift_amt=scalar(@Apache::inputtags::responselist);
} elsif ($Apache::lonhomework::parsing_a_task) {
- $id1=$Apache::bridgetask::dimension;
- if (!$ignore_id2 && defined($Apache::bridgetask::instance[-1])) {
- $id2=$Apache::bridgetask::instance[-1];
+ $id1=&Apache::bridgetask::get_dim_id();
+ if (!$ignore_id2 && ref($Apache::bridgetask::instance{$id1})) {
+ $id2=$Apache::bridgetask::instance{$id1}[-1];
+ $shift_amt=scalar(@{$Apache::bridgetask::instance{$id1}});
+ } else {
+ $shift_amt=0;
}
- $shift_amt=scalar(@Apache::bridgetask::instance);
}
&Apache::lonxml::debug("id1: $id1, id2: $id2, shift_amt: $shift_amt");
if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
@@ -304,7 +306,7 @@ sub handle_previous {
}
sub view_or_modify {
- my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
my $myself=0;
if ( ($name eq $env{'user.name'}) && ($domain eq $env{'user.domain'}) ) {
$myself=1;
@@ -338,7 +340,7 @@ sub end_dataresponse {
if ( $target eq 'web' ) {
} elsif ($target eq 'grade' ) {
if ( defined $env{'form.submitted'}) {
- my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser();
+ my ($symb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
my $allowed=&Apache::lonnet::allowed('mgr',$courseid);
if ($allowed) {
&Apache::response::setup_params('dataresponse',$safeeval);
@@ -371,7 +373,7 @@ sub start_customresponse {
if ( &Apache::response::show_answer() ) {
my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
$safeeval);
- $Apache::inputtags::answertxt{$id}=$answer;
+ $Apache::inputtags::answertxt{$id}=[$answer];
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
@@ -401,8 +403,11 @@ sub end_customresponse {
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::lonhomework::type eq 'exam' ||
+ &Apache::response::submitted('scantron')) {
+ &Apache::response::scored_response($part,$id);
+ } elsif ( $response =~ /[^\s]/ &&
+ $Apache::response::custom_answer_type eq 'loncapa/perl') {
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -427,6 +432,101 @@ sub end_customresponse {
$error;
}
}
+ } elsif ( $target eq 'answer') {
+ $result = &Apache::response::answer_header('customresponse');
+ my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
+ $safeeval);
+ if ($env{'form.answer_output_mode'} ne 'tex') {
+ $answer = ''.$answer.'';
+ }
+ $result .= &Apache::response::answer_part('customresponse',$answer);
+ $result .= &Apache::response::answer_footer('customresponse');
+ }
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ &Apache::lonxml::increment_counter(&Apache::response::repetition());
+ }
+ pop(@Apache::lonxml::namespace);
+ &Apache::lonxml::deregister('Apache::response',('answer'));
+ &Apache::response::end_response();
+ return $result;
+}
+
+
+sub start_mathresponse {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $id = &Apache::response::start_response($parstack,$safeeval);
+ push(@Apache::lonxml::namespace,'mathresponse');
+ my $result;
+ 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::select_arg('Algebra System:',
+ 'cas',
+ ['maxima'],
+ $token);
+ $result.=&Apache::edit::text_arg('Algebra System:',
+ 'cas',$token);
+ $result.=&Apache::edit::text_arg('Argument Array:',
+ 'args',$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 {
+ 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]/ ) {
+ 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'));
@@ -434,6 +534,7 @@ sub end_customresponse {
return $result;
}
+
sub start_answer {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
@@ -592,9 +693,10 @@ sub setup_params {
{
my @answer_bits;
+ my $need_row_start;
sub answer_header {
- my ($type,$increment) = @_;
+ my ($type,$increment,$rows) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
undef(@answer_bits);
@@ -607,34 +709,58 @@ sub answer_header {
}
push(@answer_bits,$bit);
} else {
+ my $td = '';
$result = '';
if ($Apache::lonhomework::type eq 'exam') {
- $result .= '| '.$Apache::lonxml::counter+$increment. ') | ';
+ $result .= $td.($Apache::lonxml::counter+$increment). ')';
} else {
- $result .= 'Answer for Part:'.$Apache::inputtags::part.' | ';
+ $result .= $td.&mt('Answer for Part: [_1]',
+ $Apache::inputtags::part).'';
}
$result .= "\n";
+ $need_row_start = 0;
+ }
+ return $result;
+}
+
+sub next_answer {
+ my ($type) = @_;
+ my $result;
+ if ($env{'form.answer_output_mode'} eq 'tex') {
+ # FIXME ... need to do something with tex mode
+ } else {
+ $result .= " ";
+ $need_row_start = 1;
}
return $result;
}
sub answer_part {
- my ($type,$answer) = @_;
+ my ($type,$answer,$args) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
- my $to_use='|';
- foreach my $value (32..126) {
- my $char=pack('c',$value);
- if ($answer !~ /\Q$char\E/) {
- $to_use=$char;
- last;
+ if (!$args->{'no_verbatim'}) {
+ my $to_use='|';
+ foreach my $value (32..126) {
+ my $char=pack('c',$value);
+ if ($answer !~ /\Q$char\E/) {
+ $to_use=$char;
+ last;
+ }
+ }
+ if ($answer ne '') {
+ $answer = '\verb'.$to_use.$answer.$to_use;
}
}
if ($answer ne '') {
- push(@answer_bits,'\verb'.$to_use.$answer.$to_use);
+ push(@answer_bits,$answer);
}
} else {
- $result = ''.$answer.' | ';
+ if ($need_row_start) {
+ $result .= '';
+ $need_row_start = 0;
+ }
+ $result .= '| '.$answer.' | ';
}
return $result;
}
@@ -657,7 +783,7 @@ sub answer_footer {
sub showallfoils {
if (defined($env{'form.showallfoils'})) {
- my ($symb)=&Apache::lonxml::whichuser();
+ my ($symb)=&Apache::lonnet::whichuser();
if (($env{'request.state'} eq 'construct') ||
($env{'user.adv'} && $symb eq '') ||
($Apache::lonhomework::viewgrades) ) {
@@ -879,7 +1005,7 @@ sub submitted {
}
sub add_to_gradingqueue {
- my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
if ( $courseid eq ''
|| $symb eq ''
|| $env{'request.state'} eq 'construct'
@@ -911,7 +1037,7 @@ sub add_to_gradingqueue {
# a return of 3 means it after the answer date
sub check_status {
my ($id)=@_;
- if (!$id) { $id=$Apache::linputtags::part; }
+ if (!defined($id)) { $id=$Apache::inputtags::part; }
my $curtime=&Apache::lonnet::EXT('system.time');
my $opendate=&Apache::lonnet::EXT("resource.$id.opendate");
my $duedate=&Apache::lonnet::EXT("resource.$id.duedate");
|