--- loncom/homework/grades.pm	2004/11/17 20:32:44	1.228
+++ loncom/homework/grades.pm	2004/11/23 02:37:58	1.230
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.228 2004/11/17 20:32:44 albertel Exp $
+# $Id: grades.pm,v 1.230 2004/11/23 02:37:58 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1663,6 +1663,7 @@ KEYWORDS
 			}
 		    }
 		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
+		    my $portfolio_path;
 		    if ($ENV{'form.lastSub'} eq 'lastonly' || 
 			($ENV{'form.lastSub'} eq 'hdgrade' && 
 			 $$handgrade{$part} eq 'yes')) {
@@ -1670,10 +1671,20 @@ KEYWORDS
 			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
 			    $display_part.' <font color="#999999">( ID '.$respid.
 			    ' )</font>&nbsp; &nbsp;';
+			if ($record{"resource.$partid.$respid.portfiles"}) {
+			    $portfolio_path = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
+			    &Apache::lonnet::logthis("found a portfolio file".$record{"resource.$partid.$respid.portfiles"});
+			    &Apache::lonnet::logthis("uploaded URL file".$record{"resource.$partid.$respid.uploadedurl"});
+			} else {
+			    $portfolio_path = '';
+			}
 			if ($record{"resource.$partid.$respid.uploadedurl"}) {
 			    &Apache::lonnet::allowuploaded('/adm/grades',
-			      $record{"resource.$partid.$respid.uploadedurl"});
-			    $lastsubonly.='<a href="'.$record{"resource.$partid.$respid.uploadedurl"}.'" target="lonGRDs"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
+			    $record{"resource.$partid.$respid.uploadedurl"});
+			    $lastsubonly.='<a href="'.$portfolio_path.$record{"resource.$partid.$respid.uploadedurl"}.'" target="lonGRDs"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
+			}
+			if ($record{"resource.$partid.$respid.portfiles"}) {
+			    $lastsubonly.='<a href="'.$portfolio_path.$record{"resource.$partid.$respid.portfiles"}.'" target="lonGRDs"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
 			}
 			$lastsubonly.='<b>Submitted Answer: </b>'.
 			    &cleanRecord($subval,$responsetype,$symb,$partid,
@@ -4632,7 +4643,7 @@ SCANTRONFORM
 	    my $result=&Apache::lonnet::ssi($resource->src(),%form);
 	    if ($result ne '') {
 		&Apache::lonnet::logthis("scantron grading error -> $result");
-		&Apache::lonnet::logthis("scantron grading error info name $uname domain $domain course $ENV{'request.course.id'} url $resource->src()");
+		&Apache::lonnet::logthis("scantron grading error info name $uname domain $udom course $ENV{'request.course.id'} url ".$resource->src());
 	    }
 	    if (&Apache::loncommon::connection_aborted($r)) { last; }
 	}