--- loncom/homework/grades.pm	2003/11/12 21:18:10	1.157
+++ loncom/homework/grades.pm	2003/11/12 21:37:07	1.159
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.157 2003/11/12 21:18:10 albertel Exp $
+# $Id: grades.pm,v 1.159 2003/11/12 21:37:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3371,24 +3371,13 @@ sub getSequenceDropDown {
     return $result;
 }
 
-#FIXME, I am in loncreatecourse, use that one instead
-sub propath {
-    my ($udom,$uname)=@_;
-    $udom=~s/\W//g;
-    $uname=~s/\W//g;
-    my $subdir=$uname.'__';
-    $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
-    my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
-    return $proname;
-} 
-
 sub scantron_uploads {
     if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
     my $result=	'<select name="scantron_selectfile">';
     my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
     my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
     my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
-				       &propath($cdom,$cname));
+				    &Apache::locommon::propath($cdom,$cname));
     foreach my $filename (@files) {
 	($filename)=split(/&/,$filename);
 	if ($filename!~/^scantron_orig_/) { next ; }
@@ -3876,8 +3865,7 @@ sub scantron_validate_ID {
 	    $found{'usernames'}{$username}++;
 	} else {
 	    if ($id =~ /^\s*$/) {
-		my $username=&scan_data($scan_dat
-a,"$i.user");
+		my $username=&scan_data($scan_data,"$i.user");
 		if (defined($username) && $found{'usernames'}{$username}) {
 		    &scantron_get_correction($r,$i,$scan_record,
 					     \%scantron_config,
@@ -4079,7 +4067,8 @@ SCANTRONFORM
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
 					  'Processing first student');
     my $start=&Time::HiRes::time();
-    
+    my $i=-1;
+    my ($uname,$udom);
     while ($i<$scanlines->{'count'}) {
  	($uname,$udom)=('','');
  	$i++;