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

Diff for /loncom/homework/essayresponse.pm between versions 1.20 and 1.32

version 1.20, 2003/01/24 18:30:54 version 1.32, 2003/04/29 20:32:21
Line 49  sub start_essayresponse { Line 49  sub start_essayresponse {
  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;
  my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"});   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>'.
       '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.
       ' Submit entries below as answer to receive credit <br />'.
       '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'.
       ' Save entries below as a draft answer (not submitting them for credit yet) '.
       '</td></tr>';
  if ($ncol > 0) {   if ($ncol > 0) {
     $result .='<tr><td>'.      $result .='<tr><td>'.
  'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.   'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
Line 67  sub start_essayresponse { Line 74  sub start_essayresponse {
 "'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />';  "'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />';
            if ($uploadedfile) {             if ($uploadedfile) {
        $result.='Currently submitted: <tt><a href="'.         $result.='Currently submitted: <tt><a href="'.
                 &Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).'">'.$uploadedfile.'</a></tt>';                  &Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).'"><img src="/adm/lonIcons/unknown.gif" border=0"> '.$uploadedfile.'</a></tt>';
            } else {             } else {
               $result.='(Hand in a file you have prepared on your computer)';                $result.='(Hand in a file you have prepared on your computer)';
            }             }
            $result.='</td></tr>';              $result.='</td></tr>'; 
         }          }
  $result.='<tr><td>'.          $result.='</table>';
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.  
     ' Submit text below as answer to receive credit <br />'.  
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'.  
     ' Save text below as a draft answer (not submitting it for credit yet) '.  
     '</td></tr></table>';  
     }      }
     return $result;      return $result;
 }  }
Line 87  sub end_essayresponse { Line 89  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 $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};
Line 95  sub end_essayresponse { Line 98  sub end_essayresponse {
     $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);
  }   }
         my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};   if ( defined($ENV{'form.submitted'}) &&
         if ($filename =~ /[^\s]/) {       $ENV{'form.submitted'} eq 'scantron' ) {
     $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;      $increment=&Apache::response::scored_response($part,$id);
             $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=   } elsif ( defined($ENV{'form.submitted'}) ) {
               &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id);      my $response      = $ENV{'form.HWVAL_'.$id};
         }              my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
  if ( defined $ENV{'form.submitted'}) {      if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {
     my $response      = $ENV{'form.HWVAL'.$id};    my $award;
     if ( $response =~ /[^\s]/) {  
  my $award;  
  if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {   if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
     $award='SUBMITTED';      $award='SUBMITTED';
  } else {   } else {
     $award='DRAFT';      $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);
                         $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"}=$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);
  &Apache::response::handle_previous(\%previous,$award);   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') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_table();   $result.=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Live blank on scoring form}\vskip 0 mm';      my $repetition=&Apache::response::repetition();
     &Apache::lonxml::increment_counter();      $result.='\begin{enumerate}';
     $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm \end{enumerate}';      for (my $i=0;$i<$repetition;$i++) {
     &Apache::lonxml::increment_counter();   $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
       '}.]\textit{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 $result;      return $result;
 }  }
Removed from v.1.20  
changed lines
  Added in v.1.32

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