--- loncom/homework/randomlabel.pm	2003/09/23 21:20:42	1.49
+++ 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.49 2003/09/23 21:20:42 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'));
 }
@@ -92,13 +95,14 @@ sub start_randomlabel {
     }
     my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
     my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
-    my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
+    my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
     if (!$texwidth) { $texwidth=90; }
     $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;
@@ -120,20 +124,14 @@ sub start_randomlabel {
 		    $temp_file = Apache::File->new('>>'.$filename);
 		    $newbgimg =~ s/(.*)\/res\//\/home\/httpd\/html\/res\//;
 		    print $temp_file "$newbgimg\n";
-		    $bgimg =~ m/\/([^\/]+)$/;
-		    $bgimg = '/home/httpd/prtspool/'.$1;
-		}
+		    $bgimg=~s/\/home\/httpd\/html\/res/\/home\/httpd\/prtspool/;		}
 	    }
 	}
 	$bgimg=~s/\/$//;
 	my $dirtywidth=$texwidth+5;
-	if ($texwidth==90) {
-	    $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
-		$bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
-	} else {
-	    $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
-		$bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
-	}
+	$result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.
+	    $texwidth.' mm \epsffile{'.$bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.
+	    $texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$Apache::edit::bgimgsrc=
@@ -164,22 +162,17 @@ 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);
 	my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
-	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
+	my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
         if (!$texwidth) { $texwidth=90; }
 	my $howtoskipback = $texwidth*$height/$width;
 	$result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';
@@ -189,6 +182,14 @@ sub end_randomlabel {
     return $result;
 }
 
+sub adjust_textwidth {
+    my $texwidth=shift; 
+    my $pagewidth=$ENV{'form.textwidth'};
+    $pagewidth=~s/\s*mm\s*$//;
+    if ($texwidth>$pagewidth) {$texwidth=$pagewidth;}
+    return $texwidth;
+}
+
 sub start_labelgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
@@ -277,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') {
@@ -287,7 +288,7 @@ sub end_labelgroup {
 	my $WY1=0; #  Web y-coord. of (ULC)
 	my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
 	my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);
-	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1);
+	my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1));
 	if (!$texwidth) { $texwidth=90; }
 	my $TX1=0;
 	my $TY1=$texwidth*($wheight/$wwidth);
@@ -402,7 +403,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,
@@ -414,7 +414,7 @@ sub start_label {
 		$result = $token->[4];
 	    }
 	}
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/label",$parser);
     }
     return $result;
 }