--- loncom/homework/randomlylabel.pm	2005/11/15 20:46:27	1.27
+++ loncom/homework/randomlylabel.pm	2006/05/30 12:45:37	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.27 2005/11/15 20:46:27 albertel Exp $
+# $Id: randomlylabel.pm,v 1.28 2006/05/30 12:45:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -205,6 +205,9 @@ use GD;
 use GD::Polyline();
 use LWP::UserAgent();
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 sub get_image {
     my ($imgsrc,$set_trans)=@_;
@@ -276,7 +279,7 @@ sub handler {
 	$prefix='form.';
     }
     if (defined($env{$prefix."BGIMG"})) {
-	my $bgimg=&Apache::lonnet::unescape($env{$prefix."BGIMG"});
+	my $bgimg=&unescape($env{$prefix."BGIMG"});
 	#&Apache::lonnet::logthis("BGIMG is ".$bgimg);
 	$image=&get_image($bgimg,0);
 	if (! defined($image)) {
@@ -371,7 +374,7 @@ sub handler {
 	} elsif ($type eq 'IMAGE') {
 	    my ($x,$y,$file,$transparent,$srcX,$srcY,$destW,$destH,$srcW,
 		$srcH)=split(':',$env{$prefix."OBJ$i"});
-	    $file=&Apache::lonnet::unescape($file);
+	    $file=&unescape($file);
 	    if (!defined($transparent)) { $transparent=1; }
 	    my $subimage=&get_image($file,$transparent);
 	    if (!defined($subimage)) {
@@ -388,7 +391,7 @@ sub handler {
 	} elsif ($type eq 'LABEL') {
 	    my ($x,$y,$text,$font,$color,$direction)=
 		split(':',$env{$prefix."OBJ$i"});
-	    $text=&Apache::lonnet::unescape($text);
+	    $text=&unescape($text);
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    my $type='normal';
 	    my ($height,$fontref);