--- loncom/lonnet/perl/lonnet.pm	2009/04/11 21:43:02	1.994
+++ loncom/lonnet/perl/lonnet.pm	2009/05/05 00:42:35	1.995
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.994 2009/04/11 21:43:02 raeburn Exp $
+# $Id: lonnet.pm,v 1.995 2009/05/05 00:42:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2166,9 +2166,12 @@ sub userfileupload {
         close($fh);
         return $fullpath.'/'.$fname;
     }
-    
+    if ($subdir eq 'scantron') {
+        $fname = 'scantron_orig_'.$fname;
+    } else {   
 # Create the directory if not present
-    $fname="$subdir/$fname";
+        $fname="$subdir/$fname";
+    }
     if ($coursedoc) {
 	my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
 	my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};