version 1.76, 2006/10/16 09:27:54
|
version 1.81, 2007/01/08 11:12:44
|
Line 31 use strict;
|
Line 31 use strict;
|
use Apache::lonxml(); |
use Apache::lonxml(); |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
use LONCAPA; |
|
|
|
|
Line 147 sub end_essayresponse {
|
Line 146 sub end_essayresponse {
|
# |
# |
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
my ($symb,$crsid,$domain,$name)= |
my ($symb,$crsid,$domain,$name)= |
&Apache::lonxml::whichuser(); |
&Apache::lonnet::whichuser(); |
if ($crsid) { |
if ($crsid) { |
my $akey=$name.'.'.$domain.'.'.$crsid; |
my $akey=$name.'.'.$domain.'.'.$crsid; |
my $essayurl= |
my $essayurl= |
&Apache::lonnet::declutter($ENV{'REQUEST_URI'}); |
&Apache::lonnet::declutter($ENV{'REQUEST_URI'}); |
my ($adom,$aname,$apath)= |
my ($adom,$aname,$apath)= |
($essayurl=~/^(\w+)\/(\w+)\/(.*)$/); |
($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); |
$apath=&escape($apath); |
$apath=&escape($apath); |
$apath=~s/\W/\_/gs; |
$apath=~s/\W/\_/gs; |
&Apache::lonnet::put('nohist_essay_'.$apath, |
&Apache::lonnet::put('nohist_essay_'.$apath, |
Line 170 sub end_essayresponse {
|
Line 169 sub end_essayresponse {
|
$result .= &Apache::inputtags::exam_score_line($target); |
$result .= &Apache::inputtags::exam_score_line($target); |
|
|
} elsif ($target eq 'answer') { |
} elsif ($target eq 'answer') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
$result.=&Apache::response::answer_header($$tagstack[-1]); |
$result .= '\begin{tabular}{|l|}'; |
my $answer = &mt('Essay will be hand graded.'); |
$result .= '\hline'; |
$result.=&Apache::response::answer_part($$tagstack[-1],$answer, |
$result .= ' Answer for essay will be hand graded \\\\ '; |
{'no_verbatim' => 1}); |
$result .= '\\hline'; |
$result.=&Apache::response::answer_footer($$tagstack[-1]); |
$result .= '\end{tabular}'; |
|
$result .= '\vskip 3mm'; |
|
} else { |
|
$result.=&Apache::response::answer_header($$tagstack[-1]); |
|
$result.=&Apache::response::answer_part($$tagstack[-1],''); |
|
$result.=&Apache::response::answer_footer($$tagstack[-1]); |
|
} |
|
} |
} |
|
|
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
Line 227 sub file_submission {
|
Line 219 sub file_submission {
|
$$uploadedflag=1; |
$$uploadedflag=1; |
} |
} |
if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { |
if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { |
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]); |
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]); |
&Apache::lonnet::clear_selected_files($name); |
&Apache::lonnet::clear_selected_files($name); |
Line 241 sub file_submission {
|
Line 233 sub file_submission {
|
} |
} |
} elsif ($which eq 'portfiles' && |
} elsif ($which eq 'portfiles' && |
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=""; |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=""; |
} |
} |