--- loncom/homework/randomlabel.pm	2003/10/30 20:52:54	1.52
+++ loncom/homework/randomlabel.pm	2003/11/11 00:25:24	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.52 2003/10/30 20:52:54 albertel Exp $
+# $Id: randomlabel.pm,v 1.53 2003/11/11 00:25:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,6 +63,9 @@ use Apache::edit;
 use Apache::File();
 use Apache::Constants qw(:common :http);
 
+my %args;
+my $cgi_id;
+
 BEGIN {
     &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
 }
@@ -97,8 +100,9 @@ sub start_randomlabel {
     $Apache::randomlabel::tlabel_cnt=0;
     $Apache::randomlabel::ilabel_cnt=0;
     if ($target eq 'web') {
-	&Apache::lonxml::startredirection();
-	$result.="BGIMG=".&Apache::lonnet::escape($bgimg);
+	$cgi_id=&Apache::loncommon::get_cgi_id();
+	%args=();
+	$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
     } elsif ($target eq 'tex') {
 	my $newbgimg = $bgimg;
 	$bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
@@ -158,17 +162,12 @@ sub end_randomlabel {
     my $count;
     pop @Apache::lonxml::namespace;
     if ($target eq 'web') {
-	my $args=&Apache::lonxml::endredirection();
-	$args=~s/\s*&/&/g;
-	$args=~s/\s*$//;
 	$count = $Apache::randomlabel::tlabel_cnt;
-	if( $count != 0) { $args.= "&COUNT=$count"; }
+	if( $count != 0) { $args{"cgi.$cgi_id.COUNT"}=$count; }
 	$count = $Apache::randomlabel::ilabel_cnt;
-	if( $count != 0) { $args.= "&ICOUNT=$count"; }
-	my $token=$Apache::lonxml::curdepth.'_'.$$;
-	$result.='<img src="/adm/randomlabel.png?token='.$token;
-	$result.='" /><br />'."\n";
-	&Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args)));
+	if( $count != 0) { $args{"cgi.$cgi_id.ICOUNT"}=$count; }
+	$result.='<img src="/adm/randomlabel.png?token='.$cgi_id.'" /><br />'."\n";
+	&Apache::lonnet::appenv(%args);
     } elsif ($target eq 'tex') {
 	$result='\end{picture}\\\\';
 	my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
@@ -279,9 +278,9 @@ sub end_labelgroup {
 		&Apache::lonxml::error('Unknown type of label :'.$type.':');
 	    }
 	    if ($target eq 'web') {
-		$result .= '&'. $str  .'='.&Apache::lonnet::escape($label);
-		$result .= '&'. $xstr .'='.$x;
-		$result .= '&'. $ystr .'='.$y;
+		$args{"cgi.$cgi_id.$str"} =&Apache::lonnet::escape($label);
+		$args{"cgi.$cgi_id.$xstr"}=$x;
+		$args{"cgi.$cgi_id.$ystr"}=$y;
 	    }
 	}
     } elsif ($target eq 'tex') {