Diff for /loncom/homework/randomlylabel.pm between versions 1.14 and 1.15

version 1.14, 2004/01/12 19:53:54 version 1.15, 2004/02/11 21:51:15
Line 36  use Apache::Constants qw(:common); Line 36  use Apache::Constants qw(:common);
 use Apache::loncommon();  use Apache::loncommon();
 use GD();  use GD();
 use GD::Polyline();  use GD::Polyline();
   use LWP::UserAgent();
   
 sub get_image {  sub get_image {
     my ($imgsrc,$set_trans)=@_;      my ($imgsrc,$set_trans)=@_;
     my $image;      my $image;
     if ($imgsrc !~ /\.(png|jpg|jpeg)$/i) {      &Apache::lonnet::logthis("imagesrc1 is $imgsrc");
       if ($imgsrc !~ m|^(/home/)|) {
    &Apache::lonnet::logthis("imagesrc2 is $imgsrc");
    if ($imgsrc !~ /^http:/) {
       $imgsrc="http://".$ENV{'HTTP_HOST'}.$imgsrc;
    }
    &Apache::lonnet::logthis("imagesrc3 is $imgsrc");
    &Apache::lonnet::logthis("LWP fetching image $imgsrc");
    my $ua=new LWP::UserAgent;
    my $request=new HTTP::Request('GET',"$imgsrc");
    $request->header(Cookie => $ENV{'HTTP_COOKIE'});
    my $file="/tmp/imagetmp".$$;
    my $response=$ua->request($request,$file);
    &Apache::lonnet::logthis("contetn is ".$response->content_type);
    &Apache::lonnet::logthis($response->is_success);
    &Apache::lonnet::logthis($response->status_line);
    if ($response->is_success) {
       if ($response->content_type !~ m-/(png|jpg|jpeg)$-i) {
    my $conv_image = Image::Magick->new;
    my $current_figure = $conv_image->Read('filename'=>$file);
    $conv_image->Set('magick'=>'png');
    my @blobs=$conv_image->ImageToBlob();
    undef $conv_image;
    $image = GD::Image->new($blobs[0]);
       } else {
    GD::Image->trueColor(1);
    $image = GD::Image->new($file);
       }
    }
       } elsif ($imgsrc !~ /\.(png|jpg|jpeg)$/i) {
  my $conv_image = Image::Magick->new;   my $conv_image = Image::Magick->new;
  my $current_figure = $conv_image->Read('filename'=>$imgsrc);   my $current_figure = $conv_image->Read('filename'=>$imgsrc);
  $conv_image->Set('magick'=>'png');   $conv_image->Set('magick'=>'png');
Line 61  sub get_image { Line 91  sub get_image {
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     $r->content_type('image/png');      $r->content_type('image/png');
       $r->send_http_header;
     my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});      my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
       &Apache::lonnet::logthis("BGIMG is ".$ENV{"cgi.$id.BGIMG"});
     my $image=&get_image(&Apache::lonnet::unescape($ENV{"cgi.$id.BGIMG"}),0);      my $image=&get_image(&Apache::lonnet::unescape($ENV{"cgi.$id.BGIMG"}),0);
     if (! defined($image)) {      if (! defined($image)) {
         &Apache::lonnet::logthis('Unable to create image object for -'.$id.'-'.          &Apache::lonnet::logthis('Unable to create image object for -'.$id.'-'.

Removed from v.1.14  
changed lines
  Added in v.1.15


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