Diff for /loncom/homework/imageresponse.pm between versions 1.89 and 1.92

version 1.89, 2007/10/08 09:22:50 version 1.92, 2008/02/01 22:05:45
Line 59  sub start_imageresponse { Line 59  sub start_imageresponse {
  $result=&Apache::response::meta_package_write('imageresponse');   $result=&Apache::response::meta_package_write('imageresponse');
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  my $part_id="$Apache::inputtags::part.$id";   my $part_id="$Apache::inputtags::part.$id";
           $Apache::lonhomework::analyze{"$part_id.type"} = 'imageresponse';
  push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);   push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
  push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },   push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
       1);        1);
Line 79  sub start_imageresponse { Line 80  sub start_imageresponse {
 sub end_imageresponse {  sub end_imageresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my $part_id = $Apache::inputtags::part;      my $part_id     = $Apache::inputtags::part;
       my $response_id = $Apache::inputtags::response[-1]; 
   
     pop(@Apache::lonxml::namespace);      pop(@Apache::lonxml::namespace);
     &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));      &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
Line 97  sub end_imageresponse { Line 99  sub end_imageresponse {
     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(&Apache::response::repetition(),    &Apache::lonxml::increment_counter(&Apache::response::repetition(), 
    $part_id);     "$part_id.$response_id");
  if ($target eq 'analyze') {   if ($target eq 'analyze') {
     &Apache::lonhomework::set_bubble_lines();      &Apache::lonhomework::set_bubble_lines();
  }   }
Line 236  sub displayfoils { Line 238  sub displayfoils {
  if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";}   if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";}
  my $image=$Apache::response::foilgroup{"$name.image"};   my $image=$Apache::response::foilgroup{"$name.image"};
  &Apache::lonxml::debug("image is $image");   &Apache::lonxml::debug("image is $image");
  if ( $target eq 'web' && $image !~ /^http:/ ) {   if ( ($target eq 'web' || $target eq 'answer') 
        && $image !~ /^http:/ ) {
     $image=&clean_up_image($image);      $image=&clean_up_image($image);
  }   }
  push(@images,$image);   push(@images,$image);
Line 301  sub display_answers { Line 304  sub display_answers {
     foreach my $name (@$whichopt) {      foreach my $name (@$whichopt) {
  my $image=$Apache::response::foilgroup{"$name.image"};   my $image=$Apache::response::foilgroup{"$name.image"};
  &Apache::lonxml::debug("image is $image");   &Apache::lonxml::debug("image is $image");
  if ( $target eq 'web' && $image !~ /^http:/ ) {   if ( ($target eq 'web' || $target eq 'answer')
        && $image !~ /^http:/ ) {
     $image = &clean_up_image($image);      $image = &clean_up_image($image);
  }    } 
  my $token=&prep_image($image,'answeronly',$name);   my $token=&prep_image($image,'answeronly',$name);

Removed from v.1.89  
changed lines
  Added in v.1.92


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