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

Diff for /loncom/homework/essayresponse.pm between versions 1.24 and 1.28

version 1.24, 2003/02/27 17:00:08 version 1.28, 2003/04/18 08:00:04
Line 89  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 97  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);
  }   }
  if ( defined $ENV{'form.submitted'}) {   if ( defined($ENV{'form.submitted'}) &&
     my $response      = $ENV{'form.HWVAL'.$id};       $ENV{'form.submitted'} eq 'scantron' ) {
       my $repetition=&Apache::response::repetition();
       $increment=$repetition;
       my $score=0;
       for (my $i=0;$i<$repetition;$i++) {
    my $increase=&Apache::response::getresponse($i+1);
    if ($increase ne '') { $score+=$increase+1; }
       }
       my $weight = &Apache::lonnet::EXT("resource.$id.weight");
       my $pcr=$score/$weight;
       #FIXME, won't work for multiple essay in a single part
       $Apache::lonhomewok::results{"resource.$id.awarded"};
    } elsif ( defined($ENV{'form.submitted'}) ) {
       my $response      = $ENV{'form.HWVAL_'.$id};
             my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};              my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
     if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {      if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {
   my $award;    my $award;
Line 132  sub end_essayresponse { Line 146  sub end_essayresponse {
  $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{Leave 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.24  
changed lines
  Added in v.1.28

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