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

Diff for /loncom/homework/imageresponse.pm between versions 1.41 and 1.42.2.1

version 1.41, 2003/11/11 00:25:24 version 1.42.2.1, 2004/01/15 22:25:31
Line 104  sub whichfoils { Line 104  sub whichfoils {
 }  }
   
 sub prep_image {  sub prep_image {
     my ($image)=@_;      my ($image,$mode,$name)=@_;
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $respid=$Apache::inputtags::response['-1'];      my $respid=$Apache::inputtags::response['-1'];
     my $id=&Apache::loncommon::get_cgi_id();      my $id=&Apache::loncommon::get_cgi_id();
Line 131  sub prep_image { Line 131  sub prep_image {
     join(':',(($x-$length),($y+$length),($x+$length),($y-$length),      join(':',(($x-$length),($y+$length),($x+$length),($y-$length),
       "FF0000",($width)));        "FF0000",($width)));
     }      }
       if ($mode eq 'answer') {
    my $width = 1;
    my $extrawidth = 2;
    my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
    foreach my $area (@areas) {
       my ($x1,$y1,$x2,$y2)=
    ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);
       my $i=$x{"cgi.$id.BOXCOUNT"}++;
       $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF",
     ($width+$extrawidth)));
       $i=$x{"cgi.$id.BOXCOUNT"}++;
       $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width));
    }
       }
     &Apache::lonnet::appenv(%x);      &Apache::lonnet::appenv(%x);
     return $id;      return $id;
 }  }
Line 157  sub displayfoils { Line 171  sub displayfoils {
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";   $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
     } else {      } else {
  my $token=&prep_image($image);   my $token=&prep_image($image,'answer',$name);
  $result.="<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n";   $result.="<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n";
     }      }
  } else {   } else {
Line 445  sub end_image { Line 459  sub end_image {
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";      my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
     $temp_file = Apache::File->new('>>'.$filename);       $temp_file = Apache::File->new('>>'.$filename); 
     print $temp_file "$src\n";      print $temp_file "$src\n";
     $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';      $newsrc=~s/\/home\/httpd\/html\/res//;
       $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;
       $newsrc=~s/\/\.\//\//;
       $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
       $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
  }   }
     }       } 
     return $result;      return $result;
Removed from v.1.41  
changed lines
  Added in v.1.42.2.1

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