[BACK]Return to essayresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/essayresponse.pm between versions 1.66 and 1.69

version 1.66, 2005/05/03 19:22:58 version 1.69, 2005/11/15 22:19:57
Line 42  sub start_essayresponse { Line 42  sub start_essayresponse {
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $result=&Apache::response::meta_package_write('essayresponse');   $result=&Apache::response::meta_package_write('essayresponse');
     } elsif ($target eq 'web') {      } elsif ($target eq 'web' &&
        $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
  my $part= $Apache::inputtags::part;   my $part= $Apache::inputtags::part;
  my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");   my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
  my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');   my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
Line 154  sub end_essayresponse { Line 155  sub end_essayresponse {
 sub file_submission {  sub file_submission {
     my ($part,$id,$which,$award,$uploadedflag)=@_;      my ($part,$id,$which,$award,$uploadedflag)=@_;
     my $files;      my $files;
     if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$part.'_'.$id}; }      my $jspart=$part;
       $jspart=~s/\./_/g;
       if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; }
     if ($which eq 'filename') {      if ($which eq 'filename') {
  $files = $env{'form.HWFILE'.$part.'_'.$id.'.filename'};   $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'};
     }      }
           
     if ($files =~ /[^\s]/) {      if ($files =~ /[^\s]/) {
  $files =~s/,$//;   $files =~s/,$//;
  $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;   $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
  my @submitted_files = split(/,/,$files);  
    my @submitted_files = ($files);
    if ( $which eq 'portfiles' ) {
       @submitted_files = split(/,/,$files);
    }
   
  my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");   my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
  if ($uploadedfiletypes) {   if ($uploadedfiletypes) {
     $uploadedfiletypes=~s/[^\w\,]//g;      $uploadedfiletypes=~s/[^\w\,]//g;
Line 187  sub file_submission { Line 195  sub file_submission {
     $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=      $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=
  $files;   $files;
     $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=      $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
  &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,   &Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef,
  'essayresponse');   'essayresponse');
  }   }
     } elsif ($which eq 'portfiles' &&      } elsif ($which eq 'portfiles' &&
Removed from v.1.66  
changed lines
  Added in v.1.69

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