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

Diff for /loncom/homework/essayresponse.pm between versions 1.12 and 1.35

version 1.12, 2002/07/26 20:27:33 version 1.35, 2004/05/10 23:09:18
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 4/3 Guy  
 # July, 2002, H. K. Ng  
 #  
 package Apache::essayresponse;  package Apache::essayresponse;
 use strict;  use strict;
   use Apache::lonxml();
   use Apache::lonnet();
   use Apache::lonlocal;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));      &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
Line 38  BEGIN { Line 39  BEGIN {
 sub start_essayresponse {  sub start_essayresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
       my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'web') {      if ($target eq 'meta') {
    $result=&Apache::response::meta_package_write('essayresponse');
       } elsif ($target eq 'web') {
  my $part= $Apache::inputtags::part;   my $part= $Apache::inputtags::part;
  my $id  = &Apache::response::start_response($parstack,$safeeval);  
   
  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");
           $uploadedfiletypes=~s/[^\w\,]//g;
    my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
    $result='<br /><table border="1">';
    $result.='<tr><td>'.
       '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '.
       &mt('Submit entries below as answer to receive credit').' <br />'.
       '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no"> '.
       &mt('Save entries below as a draft answer (not submitting them for credit yet)').
       ' </td></tr>';
  if ($ncol > 0) {   if ($ncol > 0) {
     $result .='<br />Collaborators: <input type="text" size="70" max="80" name="HWCOL'.      $result .='<tr><td>'.
  $id.'" value="'.$coll.'" /><br />'.   'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
  '(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '.   $part.'_'.$id.'" value="'.$coll.'" /><br />'.
  'smithje or smithje@'.$ENV{'user.domain'}.'.)<br />';   &mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$ENV{'user.domain'}).'<br />';
     $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);      $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
       $result .='</td></tr>';
  }   }
           if ($uploadedfiletypes) {
       $result.='<tr><td>'.&mt('Submit a file:').
    ' <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 />';
              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>';
     }      }
     return $result;      return $result;
 }  }
   
 sub end_essayresponse {  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::response::start_response($parstack,$safeeval);      my $id            = $Apache::inputtags::response[-1];
     my $collaborators = $ENV{'form.HWCOL'.$id};      my $increment     = 1;
     if ($collaborators =~ /[^\s]/) {      my $result;
  my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});  
   
  $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators  
     if ($collaborators ne $previous_list);  
     }  
     if ( $target eq 'grade' ) {      if ( $target eq 'grade' ) {
  if ( defined $ENV{'form.submitted'}) {   my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};
     my $response      = $ENV{'form.HWVAL'.$id};   if ($collaborators =~ /[^\s]/) {
     if ( $response =~ /[^\s]/) {      my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
       $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
    if ($collaborators ne $previous_list);
    }
    if ( defined($ENV{'form.submitted'}) &&
        $ENV{'form.submitted'} eq 'scantron' ) {
       $increment=&Apache::response::scored_response($part,$id);
    } elsif ( defined($ENV{'form.submitted'}) ) {
       my $response      = $ENV{'form.HWVAL_'.$id};
               my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
       if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {
     my $award;
    if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
       $award='SUBMITTED';
    } else {
       $award='DRAFT';
    }
                   my $uploadedflag=0;
                   if ($filename =~ /[^\s]/) {
               my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
                      $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';
                      }
           }
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED";   $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);
  &Apache::response::handle_previous(\%previous,'SUBMITTED');   unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); }
   #
   # Store with resource author for similarity testing
   #
                   if ($award eq 'SUBMITTED') {
       my ($symb,$crsid,$domain,$name)=
    &Apache::lonxml::whichuser();
       if ($crsid) {
    my $akey=$name.'.'.$domain.'.'.$crsid;
    my $essayurl=
       &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
    my ($adom,$aname,$apath)=
       ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
                           $apath=&Apache::lonnet::escape($apath);
    $apath=~s/\W/\_/gs;
    &Apache::lonnet::put('nohist_essay_'.$apath,
    { $akey => $response },$adom,$aname);
       }
                  }
       }
    }
       } elsif ($target eq 'edit') {
    $result.=&Apache::edit::end_table();
       } elsif ($target eq 'tex') {
    if ($Apache::lonhomework::type eq 'exam') {
       my $repetition=&Apache::response::repetition();
       $result.='\begin{enumerate}';
       for (my $i=0;$i<$repetition;$i++) {
    $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
       '}.]\textit{'.&mt('Leave blank on scoring form').
       '}\vskip 0 mm';
     }      }
       $result.= '\end{enumerate}';
  }   }
     }      }
       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
    $target eq 'tex' || $target eq 'analyze') {
    &Apache::lonxml::increment_counter($increment);
       }
     &Apache::response::end_response;      &Apache::response::end_response;
     return '';      return $result;
 }  }
   
 sub check_collaborators {  sub check_collaborators {
Removed from v.1.12  
changed lines
  Added in v.1.35

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