--- loncom/homework/inputtags.pm 2006/06/12 22:03:44 1.196
+++ loncom/homework/inputtags.pm 2006/07/14 18:12:16 1.200
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.196 2006/06/12 22:03:44 albertel Exp $
+# $Id: inputtags.pm,v 1.200 2006/07/14 18:12:16 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -284,8 +284,9 @@ sub start_textline {
my $partid=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER'
- || ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER' &&
- $Apache::lonhomework::history{"resource.$partid.solved"} !~ /^correct/ )) {
+ || lc($Apache::lonhomework::problemstatus) eq 'no'
+ || ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER'
+ && $Apache::lonhomework::history{"resource.$partid.solved"} !~ /^correct/ )) {
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
my $maxlength;
if ($size eq '') { $size=20; } else {
@@ -440,12 +441,12 @@ sub file_selector {
''.
'
';
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
- my (@filelist,@bad_file_list);
- foreach my $file (split(',',&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
+ my (@file_list,@bad_file_list);
+ foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
my $url="/uploaded/$domain/$user/portfolio$file";
my $icon=&Apache::loncommon::icon($url);
- push(@filelist,''.$file.'');
if (! &Apache::lonnet::stat_file($url)) {
&Apache::lonnet::logthis("bad file is $url");
@@ -453,9 +454,15 @@ sub file_selector {
'" border="0" />'.$file.'');
}
}
- $result.=&mt("Portfolio files previously selected: [_1]",join(', ',@filelist));
+ my $files = ''.
+ join(', ',@file_list).
+ '';
+ $result.=&mt("Portfolio files previously selected: [_1]",$files);
if (@bad_file_list) {
- $result.='
'.&mt('These file(s) don\'t exist: [_1]',join(', ',@bad_file_list));
+ my $bad_files = ''.
+ join(', ',@bad_file_list).
+ '';
+ $result.='
'.&mt('These file(s) don\'t exist: [_1]',$bad_files);
}
}
}
@@ -720,10 +727,16 @@ sub decideoutput {
}
my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
foreach my $resid(@Apache::inputtags::response){
- &Apache::lonnet::logthis("handback is ".$Apache::lonhomework::history{"resource.$part.$resid.handback"});
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
- $message.= '
Returned File';
- }
+ $message.='
';
+ my @files = split(/\s*,\s*/,
+ $Apache::lonhomework::history{"resource.$part.$resid.handback"});
+ my $file_msg;
+ foreach my $file (@files) {
+ $file_msg.= '
'.$file.'';
+ }
+ $message .= &mt('Returned file(s): [_1]',$file_msg);
+ }
}
if (lc($Apache::lonhomework::problemstatus) eq 'no' &&