--- loncom/homework/response.pm 2005/11/10 22:19:27 1.128
+++ loncom/homework/response.pm 2005/12/06 10:00:08 1.133
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.128 2005/11/10 22:19:27 albertel Exp $
+# $Id: response.pm,v 1.133 2005/12/06 10:00:08 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','algorithmicresponse'));
+ &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse'));
}
sub start_response {
@@ -362,12 +362,12 @@ sub end_dataresponse {
return $result;
}
-sub start_algorithmicresponse {
+sub start_customresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $id = &Apache::response::start_response($parstack,$safeeval);
- push(@Apache::lonxml::namespace,'algorithmicresponse');
+ push(@Apache::lonxml::namespace,'customresponse');
my $result;
- undef($Apache::response::algorithmic_answer);
+ undef($Apache::response::custom_answer);
&Apache::lonxml::register('Apache::response',('answer'));
if ($target eq 'web') {
if ( &Apache::response::show_answer() ) {
@@ -391,12 +391,12 @@ sub start_algorithmicresponse {
} elsif ($target eq 'answer' || $target eq 'grade') {
&Apache::response::reset_params();
} elsif ($target eq 'meta') {
- $result .= &Apache::response::meta_package_write('algorithmicresponse');
+ $result .= &Apache::response::meta_package_write('customresponse');
}
return $result;
}
-sub end_algorithmicresponse {
+sub end_customresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
my $part=$Apache::inputtags::part;
@@ -404,7 +404,7 @@ sub end_algorithmicresponse {
if ( $target eq 'grade' && &Apache::response::submitted() ) {
my $response = &Apache::response::getresponse();
if ( $response =~ /[^\s]/ &&
- $Apache::response::algorithmic_answer_type eq 'loncapa/perl') {
+ $Apache::response::custom_answer_type eq 'loncapa/perl') {
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -413,10 +413,10 @@ sub end_algorithmicresponse {
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$response;
my $error;
- ${$safeeval->varglob('LONCAPA::algorithmicresponse_submission')}=
+ ${$safeeval->varglob('LONCAPA::customresponse_submission')}=
$response;
- my $award = &Apache::run::run('{ my $submission=$LONCAPA::algorithmicresponse_submission;'.$Apache::response::algorithmic_answer.'}',$safeeval);
+ my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval);
if (!&Apache::inputtags::valid_award($award)) {
$error = $award;
$award = 'ERROR';
@@ -439,15 +439,15 @@ sub end_algorithmicresponse {
sub start_answer {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- $Apache::response::algorithmic_answer=
+ $Apache::response::custom_answer=
&Apache::lonxml::get_all_text_unbalanced("/answer",$parser);
- $Apache::response::algorithmic_answer_type=
+ $Apache::response::custom_answer_type=
lc(&Apache::lonxml::get_param('type',$parstack,$safeeval));
- $Apache::response::algorithmic_answer_type =~ s/\s+//g;
+ $Apache::response::custom_answer_type =~ s/\s+//g;
if ($target eq "edit" ) {
$result=&Apache::edit::tag_start($target,$token,'Answer algorithm');
$result.=&Apache::edit::editfield($token->[1],
- $Apache::response::algorithmic_answer,
+ $Apache::response::custom_answer,
'',80,4);
} elsif ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser);
@@ -592,15 +592,30 @@ sub setup_params {
}
}
+{
+ my @answer_bits;
+
sub answer_header {
- my ($type) = @_;
+ my ($type,$increment) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
- $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: \verb|'.
- $Apache::inputtags::part.'| \\\\ \hline ';
+ undef(@answer_bits);
+ my $bit;
+ if ($Apache::lonhomework::type eq 'exam') {
+ $bit = ($Apache::lonxml::counter+$increment).') ';
+ } else {
+ $bit .= ' Answer for Part: \verb|'.
+ $Apache::inputtags::part.'| ';
+ }
+ push(@answer_bits,$bit);
} else {
- $result = '<table border="1"><tr><td>Answer for Part:'.
- $Apache::inputtags::part. '</td>'."\n";
+ $result = '<table border="1"><tr>';
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result .= '<td>'.$Apache::lonxml::counter. ')</td>';
+ } else {
+ $result .= '<td>Answer for Part:'.$Apache::inputtags::part.'</td>';
+ }
+ $result .= "\n";
}
return $result;
}
@@ -617,7 +632,9 @@ sub answer_part {
last;
}
}
- $result = '\verb'.$to_use.$answer.$to_use.'\\\\ \hline ';
+ if ($answer ne '') {
+ push(@answer_bits,'\verb'.$to_use.$answer.$to_use);
+ }
} else {
$result = '<td>'.$answer.'</td>';
}
@@ -628,13 +645,18 @@ sub answer_footer {
my ($type) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
- $result = ' \end{tabular} \vskip 0 mm ';
+ my $columns = scalar(@answer_bits);
+ $result = ' \vskip 0 mm \begin{tabular}{|'.'c|'x$columns.'}\hline ';
+ $result .= join(' & ',@answer_bits);
+ $result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';
} else {
$result = '</tr></table>';
}
return $result;
}
+}
+
sub showallfoils {
if (defined($env{'form.showallfoils'})) {
my ($symb)=&Apache::lonxml::whichuser();
@@ -858,6 +880,28 @@ sub submitted {
return 0;
}
+sub add_to_gradingqueue {
+ my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ if ( $courseid eq ''
+ || $symb eq ''
+ || $env{'request.state'} eq 'construct') {
+ return;
+ }
+
+ my %queue_info = ( 'type' => 'problem',
+ 'time' => time);
+
+ if (exists($Apache::lonhomework::history{"resource.0.checkedin.slot"})) {
+ $queue_info{'slot'}=
+ $Apache::lonhomework::history{"resource.0.checkedin.slot"};
+ }
+
+ my $result=&Apache::bridgetask::add_to_queue('gradingqueue',\%queue_info);
+ if ($result ne 'ok') {
+ &Apache::lonxml::error("add_to_queue said $result");
+ }
+}
+
# basically undef and 0 (both false) mean that they still have work to do
# and all true values mean that they can't do any more work
#