--- loncom/homework/randomlabel.pm	2003/10/16 19:23:58	1.51
+++ loncom/homework/randomlabel.pm	2004/01/08 20:28:20	1.55
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.51 2003/10/16 19:23:58 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.55 2004/01/08 20:28:20 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,14 +100,15 @@ 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;
 	$bgimg= &Apache::lonnet::filelocation($bgimg);
-	$bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
-	$bgimg=~s/\/$//;
+	$bgimg=~s|http:/[^/]*//home/httpd/html|;
+	$bgimg=~s|/$||;
 	#if no eps file try to replicate it
 	if (not-e $bgimg) {
 	    if (&Apache::lonnet::repcopy($bgimg) ne OK ) {
@@ -118,12 +122,14 @@ sub start_randomlabel {
 		    my $temp_file;
 		    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
 		    $temp_file = Apache::File->new('>>'.$filename);
-		    $newbgimg =~ s/(.*)\/res\//\/home\/httpd\/html\/res\//;
+		    $newbgimg =~ s|(.*)/res/|/home/httpd/html/res/|;
 		    print $temp_file "$newbgimg\n";
-		    $bgimg=~s/\/home\/httpd\/html\/res/\/home\/httpd\/prtspool/;		}
+		    $bgimg=~s|/home/httpd/html/res|/home/httpd/prtspool|;
+		    $bgimg=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
+		}
 	    }
 	}
-	$bgimg=~s/\/$//;
+	$bgimg=~s|/$||;
 	my $dirtywidth=$texwidth+5;
 	$result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.
 	    $texwidth.' mm \epsffile{'.$bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.
@@ -158,17 +164,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 +280,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') {
@@ -404,7 +405,6 @@ sub start_label {
 	$result.=&Apache::edit::editline('',$text,'',50).
 	    &Apache::edit::end_table();
     } elsif ($target eq 'modified') {
-	my $text=$$parser[-1]->get_text("/label");
 	$result = '<label>';
 	if ($type eq 'image') {
 	    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -416,7 +416,7 @@ sub start_label {
 		$result = $token->[4];
 	    }
 	}
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/label",$parser);
     }
     return $result;
 }