--- loncom/homework/inputtags.pm	2006/01/04 05:56:16	1.186
+++ loncom/homework/inputtags.pm	2006/03/09 01:11:12	1.190
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.186 2006/01/04 05:56:16 albertel Exp $
+# $Id: inputtags.pm,v 1.190 2006/03/09 01:11:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -222,6 +222,57 @@ sub end_textfield {
     return $result;
 }
 
+sub exam_score_line {
+    my ($target) = @_;
+
+    my $result;
+    if ($target eq 'tex') {
+	my $repetition = &Apache::response::repetition();
+	$result.='\begin{enumerate}';
+	if ($env{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
+	foreach my $i (0..$repetition-1) {
+	    $result.='\item[\textbf{'.
+		($Apache::lonxml::counter+$i).
+		'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
+	}
+	$result.= '\end{enumerate}';
+    }
+
+    return $result;
+}
+
+sub exam_box {
+    my ($target) = @_;
+    my $result;
+
+    if ($target eq 'tex') {
+	$result .= '\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
+	$result .= &exam_score_line($target);
+    } elsif ($target eq 'web') {
+	my $id=$Apache::inputtags::response[-1];
+	$result.= '<br /><br />
+                   <textarea name="HWVAL_'.$id.'" rows="4" cols="50">
+                   </textarea> <br /><br />';
+    }
+    return $result;
+}
+
+sub needs_exam_box {
+    my ($tagstack) = @_;
+    my @tags = ('formularesponse',
+		'stringresponse',
+		'reactionresponse',
+		'organicresponse',
+		);
+
+    foreach my $tag (@tags) {
+	if (grep(/\Q$tag\E/,@$tagstack)) {
+	    return 1;
+	}
+    }
+    return 0;
+}
+
 sub start_textline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result = "";
@@ -252,6 +303,10 @@ sub start_textline {
 		$result.= '<input type="text" '.$readonly.' name="HWVAL_'.$id.'" value="'.
 		    $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
 	    }
+	    if ($Apache::lonhomework::type eq 'exam'
+		&& &needs_exam_box($tagstack)) {
+		$result.=&exam_box($target);
+	    }
 	} else {
 	    #right or wrong don't show what was last typed in.
 	    $result='<b>'.$Apache::inputtags::answertxt{$id}.'</b>';
@@ -271,10 +326,16 @@ sub start_textline {
 						     $safeeval,'size',
 						     'addchars','readonly');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
-    } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
+    } elsif ($target eq 'tex' 
+	     && $Apache::lonhomework::type ne 'exam') {
 	my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
 	if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
 	$result='\framebox['.$size.'][s]{\tiny\strut}';
+
+    } elsif ($target eq 'tex' 
+	     && $Apache::lonhomework::type eq 'exam'
+	     && &needs_exam_box($tagstack)) {
+	$result.=&exam_box($target);
     }
     return $result;
 }
@@ -304,6 +365,12 @@ sub start_hiddenline {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::end_table;
     }
+
+    if ( ($target eq 'web' || $target eq 'tex')
+	 && $Apache::lonhomework::type eq 'exam'
+	 && &needs_exam_box($tagstack)) {
+	$result.=&exam_box($target);
+    }
     return $result;
 }
 
@@ -363,15 +430,22 @@ sub file_selector {
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
 	if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
-	    my @filelist;
+	    my (@filelist,@bad_file_list);
 	    foreach my $file (split(',',&Apache::lonnet::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,'<a href="'.$url.'"><img src="'.$icon.
 		     '" border="0" />'.$file.'</a>');
+		if (! &Apache::lonnet::stat_file($url)) {
+		    push(@bad_file_list,'<a href="'.$url.'"><img src="'.$icon.
+			 '" border="0" />'.$file.'</a>');
+		}
 	    }
 	    $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist));
+	    if (@bad_file_list) {
+		$result.='<br />'.&mt('<font color="red">These file(s) don\'t exist:</font> <strong>[_1]</strong>',join(', ',@bad_file_list));
+	    }
 	}
     }
     $result.='</td></tr>';