--- loncom/homework/essayresponse.pm	2010/06/21 02:15:37	1.108
+++ loncom/homework/essayresponse.pm	2010/08/28 22:25:07	1.111
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.108 2010/06/21 02:15:37 raeburn Exp $
+# $Id: essayresponse.pm,v 1.111 2010/08/28 22:25:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,7 @@ sub start_essayresponse {
 	    $result .= '<td><i>'.&mt('Collaborated with [_1]',$coll).'</i></td>';
 	}
 
-        my $current_files_display = &current_file_submissions($part,$id);
+        my $current_files_display = &Apache::inputtags::current_file_submissions($part,$id);
         if ($current_files_display) {
             $result .= '<td><b>'.&mt('Submitted files:').'</b><br />'.
                        $current_files_display.'</td>';
@@ -155,10 +155,12 @@ sub end_essayresponse {
 	    $increment=&Apache::response::scored_response($part,$id);
 	} elsif ( &Apache::response::submitted() ) {
 	    my $response      = $env{'form.HWVAL_'.$id};
-            my $filename = $env{'form.HWFILE'.$part.'_'.$id.'.filename'} || 
+            my $jspart=$part;
+            $jspart=~s/\./_/g;
+            my $filename = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'} || 
                            $env{'form.HWFILETOOBIG'.$part.'_'.$id};
-            my $portfiles = $env{'form.HWPORT'.$part.'_'.$id};
-            my @deletions = &Apache::loncommon::get_env_multiple('form.HWFILE'.$part.'_'.$id.'_delete');
+            my $portfiles = $env{'form.HWPORT'.$jspart.'_'.$id};
+            my @deletions = &Apache::loncommon::get_env_multiple('form.HWFILE'.$jspart.'_'.$id.'_delete');
             my ($is_submit,$was_draft);
             if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
                  $is_submit = 1;
@@ -331,7 +333,7 @@ sub file_submission {
             }
         }
     }
-    if ($env{'form.HWFILETOOBIG'.$jspart.'_'.$id} ne '') {
+    if ($env{'form.HWFILETOOBIG'.$part.'_'.$id} ne '') {
         $$award = 'EXCESS_FILESIZE';
     } elsif ($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'} ne '') {
         my $newfile = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'};
@@ -483,8 +485,7 @@ sub file_submission {
         push(@pathitems,$restitle);
         $path .= join('/',@pathitems);
         my $formelement = 'HWFILE'.$jspart.'_'.$id;
-        my $fname = $env{'form.'.$formelement.'.filename'};
-        &Apache::lonnet::clean_filename($fname);
+        my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formelement.'.filename'});
         my $url = '/uploaded/'.$udom.'/'.$uname.'/'.$prefix.$path.'/'.$fname;
         my @stat = &Apache::lonnet::stat_file($url);
         if (@stat && $stat[0] ne 'no_such_dir') {