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

Diff for /loncom/homework/essayresponse.pm between versions 1.52 and 1.74

version 1.52, 2004/12/06 18:09:54 version 1.74, 2006/09/21 21:23:19
Line 29 Line 29
 package Apache::essayresponse;  package Apache::essayresponse;
 use strict;  use strict;
 use Apache::lonxml();  use Apache::lonxml();
 use Apache::lonnet();  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));      &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
Line 42  sub start_essayresponse { Line 45  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"},'<>&"');
  my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");   my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
         $uploadedfiletypes=~s/[^\w\,]//g;          $uploadedfiletypes=~s/[^\w\,]//g;
  my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');  
  $result='<br /><table border="1">';   $result='<br /><table border="1">';
  $result.='<tr><td>'.   $result.='<tr><td>'.
               '<label>'.
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.      '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
     &mt('Submit entries below as answer to receive credit').' <br />'.      &mt('Submit entries below as answer to receive credit').
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.              '</label> <br />'.
       '<label>'.
               '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
     &mt('Save entries below as a draft answer (not submitting them for credit yet)').      &mt('Save entries below as a draft answer (not submitting them for credit yet)').
     ' </td></tr>';      '</label>'.
               ' </td></tr>';
  if ($ncol > 0) {   if ($ncol > 0) {
     $result .='<tr><td>'.      $result .='<tr><td>'.'<label>'.
  'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.   'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
  $part.'_'.$id.'" value="'.$coll.'" /><br />'.   $part.'_'.$id.'" value="'.$coll.'" /><br />'.
  &mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$ENV{'user.domain'}).'<br />';   &mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$env{'user.domain'}).
                   '</label><br />';
     $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);      $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
     $result .='</td></tr>';      $result .='</td></tr>';
  }   }
         if ($uploadedfiletypes) {   $result.=&Apache::inputtags::file_selector($part,$id,
     $result.='<tr><td>'.&mt('Submit a file:').     $uploadedfiletypes,'both');
  ' <br /><input type="file" size="50" name="HWFILE'.  
  $part.'_'.$id.'" onFocus="this.form.enctype='.  
  "'multipart/form-data'".';" /><br />'.  
  &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.  
                 '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,'.  
                 'width=600,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>Select Portfolio Files</a>'.  
                 '<br />'.  
                 '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.  
  '<br />';  
     if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){  
         $result.="Portfolio files previously selected: <strong>".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."</strong><br />";  
     }  
   
             if ($uploadedfile) {  
        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);  
            } else {  
               $result.=&mt('(Hand in a file you have prepared on your computer)');  
            }  
            $result.='</td></tr>';   
         }  
         $result.='</table>';          $result.='</table>';
       } elsif ($target eq 'web' &&
        $Apache::inputtags::status[-1] ne 'CAN_ANSWER') {
    my $part= $Apache::inputtags::part;
    my @msgs;
    if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) {
       my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
       $result .= '<td>'.&mt('Collaborated with [_1]',$coll).'</td>';
    }
   
    my $file_submission = 
       &Apache::inputtags::show_past_file_submission($part,$id);
    if ($file_submission) {
       $result .= '<td>'.$file_submission.'</td>';
    }
   
    my $port_submission = 
       &Apache::inputtags::show_past_portfile_submission($part,$id);
    if ($port_submission) {
       $result .= '<td>'.$port_submission.'</td>';
    }
   
    if ($result ne '') {
       $result = 
    '<table class="LC_pastsubmission"><tr>'.$result.
    '</tr></table>';
    }
     }      }
     return $result;      return $result;
 }  }
Line 101  sub end_essayresponse { Line 109  sub end_essayresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $part          = $Apache::inputtags::part;      my $part          = $Apache::inputtags::part;
     my $id            = $Apache::inputtags::response[-1];      my $id            = $Apache::inputtags::response[-1];
     my $increment     = 1;      my $increment     = &Apache::response::repetition();
     my $result;      my $result;
     if ( $target eq 'grade' ) {      if ( $target eq 'grade' ) {
  my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};   my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};
  if ($collaborators =~ /[^\s]/) {   if ($collaborators =~ /[^\s]/) {
     my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');      my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
     $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators      $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
  if ($collaborators ne $previous_list);   if ($collaborators ne $previous_list);
  }   }
  if ( defined($ENV{'form.submitted'}) &&   if (  &Apache::response::submitted('scantron') ) {
      $ENV{'form.submitted'} eq 'scantron' ) {  
     $increment=&Apache::response::scored_response($part,$id);      $increment=&Apache::response::scored_response($part,$id);
  } elsif ( defined($ENV{'form.submitted'}) ) {   } elsif ( &Apache::response::submitted() ) {
     my $response      = $ENV{'form.HWVAL_'.$id};      my $response      = $env{'form.HWVAL_'.$id};
             my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};              my $filename= $env{'form.HWFILE'.$part.'_'.$id.'.filename'};
             my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};              my $portfiles = $env{'form.HWPORT'.$part.'_'.$id};
     if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {      if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
   my $award;    my $award='DRAFT';
         if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {          if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
     $award='SUBMITTED';      $award='SUBMITTED';
  } else {  
     $award='DRAFT';  
  }   }
                 my $uploadedflag=0;                  my $uploadedflag=0;
                 if ($filename =~ /[^\s]/) {   &file_submission($part,$id,'filename',\$award,\$uploadedflag);
             my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");   &file_submission($part,$id,'portfiles',\$award,\$uploadedflag);
                    $uploadedfiletypes=~s/[^\w\,]//g;  
                    $uploadedfiletypes=','.$uploadedfiletypes.',';  
                    my ($extension)=($filename=~/\.(\w+)$/);  
            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,undef,'essayresponse');  
                       $uploadedflag=1;  
    } else {  
       $award='INVALID_FILETYPE';  
                    }  
         }  
                 if ($portfiles =~ /[^\s]/) {  
                     $portfiles =~s/,$//;  
                     $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;  
                     my @submitted_files = split /,/,$portfiles;  
     my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();  
     &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);  
                     &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);  
                     &Apache::lonnet::clear_selected_files($name);  
                     $uploadedflag=1;  
            }  
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;   $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
  my %previous=&Apache::response::check_for_previous($response,$part,$id);   my %previous=&Apache::response::check_for_previous($response,$part,$id);
Line 165  sub end_essayresponse { Line 148  sub end_essayresponse {
     &Apache::lonnet::declutter($ENV{'REQUEST_URI'});      &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
  my ($adom,$aname,$apath)=   my ($adom,$aname,$apath)=
     ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);      ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
                         $apath=&Apache::lonnet::escape($apath);                          $apath=&escape($apath);
  $apath=~s/\W/\_/gs;   $apath=~s/\W/\_/gs;
  &Apache::lonnet::put('nohist_essay_'.$apath,   &Apache::lonnet::put('nohist_essay_'.$apath,
  { $akey => $response },$adom,$aname);   { $akey => $response },$adom,$aname);
Line 175  sub end_essayresponse { Line 158  sub end_essayresponse {
  }    } 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_table();   $result.=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {  
  if ($Apache::lonhomework::type eq 'exam') {      } elsif ($target eq 'tex'
     my $repetition=&Apache::response::repetition();       && $Apache::lonhomework::type eq 'exam') {
     $result.='\begin{enumerate}';   $result .= &Apache::inputtags::exam_score_line($target);
     if ($ENV{'request.state'} eq "construct" ) {$result.='\item[\strut]';}  
     for (my $i=0;$i<$repetition;$i++) {      } elsif ($target eq 'answer') {
  $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).   $result.=&Apache::response::answer_header($$tagstack[-1]);
     '}.]\textit{'.&mt('Leave blank on scoring form').   $result.=&Apache::response::answer_part($$tagstack[-1],'');
     '}\vskip 0 mm';   $result.=&Apache::response::answer_footer($$tagstack[-1]);
     }  
     $result.= '\end{enumerate}';  
     $increment=$repetition;  
  }  
     }      }
   
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter($increment);   &Apache::lonxml::increment_counter($increment);
Line 198  sub end_essayresponse { Line 178  sub end_essayresponse {
     return $result;      return $result;
 }  }
   
   sub file_submission {
       my ($part,$id,$which,$award,$uploadedflag)=@_;
       my $files;
       my $jspart=$part;
       $jspart=~s/\./_/g;
       if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; }
       if ($which eq 'filename') {
    $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'};
       }
       
       if ($files =~ /[^\s]/) {
    $files =~s/,$//;
    $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
   
    my @submitted_files = ($files);
    if ( $which eq 'portfiles' ) {
       @submitted_files = split(/\s*,\s*/,$files);
    }
   
    my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
    if ($uploadedfiletypes) {
       $uploadedfiletypes=~s/[^\w\,]//g;
       $uploadedfiletypes=','.$uploadedfiletypes.',';
       foreach my $file (@submitted_files) {
    my ($extension)=($file=~/\.(\w+)$/);
    unless ($uploadedfiletypes=~/\,$extension\,/i) {
       $$award='INVALID_FILETYPE';
    }
       }
    }
    if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {
       $$uploadedflag=1;
    }
    if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
       my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
       &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
       &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]);
       &Apache::lonnet::clear_selected_files($name);
    }
    if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') {
       $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=
    $files;
       $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
    &Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef,
    'essayresponse');
    }
       } elsif ($which eq 'portfiles' &&
        $Apache::lonhomework::history{"resource.$part.$id.$which"}) {
    my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
    &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
    $Apache::lonhomework::results{"resource.$part.$id.$which"}="";
       }
   }
   
 sub check_collaborators {  sub check_collaborators {
     my ($ncol,$coll) = @_;      my ($ncol,$coll) = @_;
     my %classlist=&Apache::lonnet::dump('classlist',      my %classlist=&Apache::lonnet::dump('classlist',
  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},   $env{'course.'.$env{'request.course.id'}.'.domain'},
  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});   $env{'course.'.$env{'request.course.id'}.'.num'});
     my (@badcollaborators,$result);      my (@badcollaborators,$result);
     my (@collaborators) = split(/\,?\s+/,$coll);      my (@collaborators) = split(/\,?\s+/,$coll);
     foreach (@collaborators) {      foreach (@collaborators) {
Line 210  sub check_collaborators { Line 244  sub check_collaborators {
  if (/@/) {   if (/@/) {
     $collaborator =~ s/@/:/;      $collaborator =~ s/@/:/;
  } else {   } else {
     $collaborator = $_.':'.$ENV{'user.domain'};      $collaborator = $_.':'.$env{'user.domain'};
  }   }
  push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);   push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
     }      }
Removed from v.1.52  
changed lines
  Added in v.1.74

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