[LON-CAPA-cvs] cvs: loncom /homework essayresponse.pm

[albertel]

albertel		Mon May 10 19:09:19 2004 EDT

  Modified files:              
    /loncom/homework	essayresponse.pm 
  Log:
  - eliminating a tokenwrapper call
  - putting uploaded essayresponse's into an essayresponse directory.
  
  
  
Index: loncom/homework/essayresponse.pm
diff -u loncom/homework/essayresponse.pm:1.34 loncom/homework/essayresponse.pm:1.35
--- loncom/homework/essayresponse.pm:1.34	Wed Mar 31 00:23:59 2004
+++ loncom/homework/essayresponse.pm	Mon May 10 19:09:18 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.34 2004/03/31 05:23:59 albertel Exp $
+# $Id: essayresponse.pm,v 1.35 2004/05/10 23:09:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,7 +73,10 @@
 		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).
 		'<br />';
            if ($uploadedfile) {
-	       my $curfile='<a href="'.&Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).
+	       my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+	       push (@Apache::lonxml::extlinks,$url);
+	       &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+	       my $curfile='<a href="'.$url.
 		   '"><img src="/adm/lonIcons/unknown.gif" border=0" /> '.
 		   $uploadedfile.'</a>';
 	       $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
@@ -122,7 +125,7 @@
 	           if ($uploadedfiletypes=~/\,$extension\,/i) {
 	              $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
                       $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
-                         &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id);
+                         &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');
                       $uploadedflag=1;
 		   } else {
 		      $award='INVALID_FILETYPE';