--- loncom/homework/randomlylabel.pm	2004/02/23 22:52:30	1.16
+++ loncom/homework/randomlylabel.pm	2004/02/23 23:54:14	1.18
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.16 2004/02/23 22:52:30 albertel Exp $
+# $Id: randomlylabel.pm,v 1.18 2004/02/23 23:54:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,29 +34,22 @@ use strict;
 use Image::Magick;
 use Apache::Constants qw(:common);
 use Apache::loncommon();
-use GD();
+use GD;
 use GD::Polyline();
 use LWP::UserAgent();
 
 sub get_image {
     my ($imgsrc,$set_trans)=@_;
     my $image;
-    &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;
@@ -78,7 +71,7 @@ sub get_image {
 	undef $conv_image;
 	$image = GD::Image->new($blobs[0]);
     } else {
-	GD::Image->trueColor(1);
+	$image = GD::Image->trueColor(1);
 	$image = GD::Image->new($imgsrc);
     }
     if ($set_trans && defined($image)) {
@@ -105,12 +98,16 @@ sub handler {
     $r->content_type('image/png');
     $r->send_http_header;
     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);
-    if (! defined($image)) {
-        &Apache::lonnet::logthis('Unable to create image object for -'.$id.'-'.
-				 $ENV{"cgi.$id.BGIMG"});
-        return OK;
+    my $image;
+    if (defined($ENV{"cgi.$id.BGIMG"})) {
+	my $bgimg=&Apache::lonnet::unescape($ENV{"cgi.$id.BGIMG"});
+	#&Apache::lonnet::logthis("BGIMG is ".$bgimg);
+	$image=&get_image($bgimg,0);
+	if (! defined($image)) {
+	    &Apache::lonnet::logthis('Unable to create image object for -'.
+				     $id.'-'.$bgimg);
+	    return OK;
+	}
     } elsif (defined($ENV{"cgi.$id.SIZE"})) {
 	my ($width,$height)=split(':',$ENV{"cgi.$id.SIZE"});
 	$image = new GD::Image($width,$height,1);
@@ -132,7 +129,6 @@ sub handler {
     my @objtypes=split(':',$ENV{"cgi.$id.OBJTYPE"});
     foreach(my $i=0;$i<$ENV{"cgi.$id.OBJCOUNT"};$i++) {
 	my $type=shift(@objtypes);
-	&Apache::lonnet::logthis("type is $type");
 	if ($type eq 'LINE') {
 	    my ($x1,$y1,$x2,$y2,$color,$thickness)=
 		split(':',$ENV{"cgi.$id.OBJ$i"});
@@ -159,15 +155,20 @@ sub handler {
 	    my ($color,$width,$open)=split(':',$ENV{"cgi.$id.OBJ$i"});
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    my $polygon = (($open) ? (new GD::Polyline) : (new GD::Polygon));
+	    my $added=0;
 	    foreach my $coord (split('-',$ENV{"cgi.$id.OBJEXTRA$i"})) {
 		my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/);
 		$polygon->addPt($x,$y);
+		$added++;
 	    }
+	    
 	    $image->setThickness($width);
-	    if ($open) {
-		$image->polydraw($polygon,$imcolor);
-	    } else {
-		$image->polygon($polygon,$imcolor);
+	    if ($added) {
+		if ($open) {
+		    $image->polydraw($polygon,$imcolor);
+		} else {
+		    $image->polygon($polygon,$imcolor);
+		}
 	    }
 	} elsif ($type eq 'ARC') {
 	    my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)=
@@ -204,9 +205,9 @@ sub handler {
 	    $text=&Apache::lonnet::unescape($text);
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    my $height=GD::Font->Giant->height;
-	    for(my $i=0;$i<$ENV{"cgi.$id.COUNT"};$i++) {
-		$image->string(GD::gdGiantFont,$x,$y-$height,$text,$black);
-	    }
+	    $image->string(GD::gdGiantFont,$x,$y-$height,$text,$imcolor);
+	} else {
+	    &Apache::lonnet::logthis("randomlylabel unable to handle object of type $type");
 	}
     }
     $image->setThickness(1);