version 1.244, 2011/01/25 04:30:13
|
version 1.247, 2011/06/08 01:39:32
|
Line 402 sub setup_capa_response {
|
Line 402 sub setup_capa_response {
|
|
|
sub check_submission { |
sub check_submission { |
my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_; |
my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_; |
my @args = ('type','tol','sig','format','unit','calc','samples'); |
my @args = ('type','tol','sig','format','unit','calc','samples','preprocess'); |
my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response); |
my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response); |
|
|
my $hideunit= |
my $hideunit= |
Line 1136 sub start_stringresponse {
|
Line 1136 sub start_stringresponse {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
|
undef(%answer); |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('stringresponse'); |
$result=&Apache::response::meta_package_write('stringresponse'); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
Line 1231 sub end_stringresponse {
|
Line 1232 sub end_stringresponse {
|
my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval); |
my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval); |
if ($$args_ref{'type'} =~ /^c[si]$/) { |
if ($$args_ref{'type'} =~ /^c[si]$/) { |
$ansstring{$name} = pop(@msgs); |
$ansstring{$name} = pop(@msgs); |
} |
|
if ($$args_ref{'type'} =~ /^c[si]$/) { |
|
my $control_chars_removed = pop(@msgs); |
my $control_chars_removed = pop(@msgs); |
my $error = pop(@msgs); |
my $error = pop(@msgs); |
if (($error ne '') || |
if (($error ne '') || |
($control_chars_removed ne '')) { |
($control_chars_removed)) { |
my ($symb,$courseid,$sdomain,$sname) = |
my ($symb,$courseid,$sdomain,$sname) = |
&Apache::lonnet::whichuser(); |
&Apache::lonnet::whichuser(); |
if ($control_chars_removed ne '') { |
if ($control_chars_removed) { |
my $showresponse = $response; |
my $showresponse = $response; |
if ($response =~ /[\000-\037]/) { |
if ($response =~ /[\000-\037]/) { |
$response =~ s/[\000-\037]//g; |
$response =~ s/[\000-\037]//g; |