Diff for /loncom/homework/grades.pm between versions 1.130.2.1.2.10 and 1.130.2.1.2.11

version 1.130.2.1.2.10, 2003/10/14 22:52:24 version 1.130.2.1.2.11, 2003/10/16 03:51:52
Line 3145  sub getSequenceDropDown { Line 3145  sub getSequenceDropDown {
     return $result;      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 {  sub scantron_uploads {
     if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};      if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
     my $result= '<select name="scantron_selectfile">';      my $result= '<select name="scantron_selectfile">';
     my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};      my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
     my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};      my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
     my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,      my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
       &Apache::loncreatecourse::propath($cdom,$cname));         &propath($cdom,$cname));
     foreach my $filename (@files) {      foreach my $filename (@files) {
  ($filename)=split(/&/,$filename);   ($filename)=split(/&/,$filename);
  if ($filename!~/^scantron_orig_/) { next ; }   if ($filename!~/^scantron_orig_/) { next ; }
Line 3959  sub scantron_upload_scantron_data_save { Line 3970  sub scantron_upload_scantron_data_save {
     $r->print("Doing upload to ".$ENV{'form.courseid'});      $r->print("Doing upload to ".$ENV{'form.courseid'});
     my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},      my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},
  $ENV{'form.domainid'});   $ENV{'form.domainid'});
     my $fname='scantron_orig_'.$ENV{'form.upfile.filename'};      my $fname=$ENV{'form.upfile.filename'};
       #FIXME
       #copied from lonnet::userfileupload()
       #make that function able to target a specified course
       # Replace Windows backslashes by forward slashes
       $fname=~s/\\/\//g;
       # Get rid of everything but the actual filename
       $fname=~s/^.*\/([^\/]+)$/$1/;
       # Replace spaces by underscores
       $fname=~s/\s+/\_/g;
       # Replace all other weird characters by nothing
       $fname=~s/[^\w\.\-]//g;
       # See if there is anything left
       unless ($fname) { return 'error: no uploaded file'; }
       $fname='scantron_orig_'.$fname;
       &Apache::lonnet::logthis("fname is $fname");
     $r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},      $r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},
     $ENV{'form.domainid'},      $ENV{'form.domainid'},
     $home,'upfile',$fname));      $home,'upfile',$fname));

Removed from v.1.130.2.1.2.10  
changed lines
  Added in v.1.130.2.1.2.11


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>