--- loncom/homework/randomlabel.pm	2003/10/16 19:23:58	1.51
+++ loncom/homework/randomlabel.pm	2004/02/23 23:25:39	1.59
@@ -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.59 2004/02/23 23:25:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,8 +63,11 @@ 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'));
+    &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
 }
 
 sub check_int {
@@ -90,44 +93,17 @@ sub start_randomlabel {
 	    $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
 	}
     }
-    my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
-    my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
-    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;
+    $Apache::randomlabel::obj_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/\/$//;
-	#if no eps file try to replicate it
-	if (not-e $bgimg) {
-	    if (&Apache::lonnet::repcopy($bgimg) ne OK ) {
-		#if replication failed try to find ps file
-		$bgimg=~s/\.eps$/\.ps/;
-		#if no ps file try to replicate it
-		if (not -e $bgimg &&
-		    &Apache::lonnet::repcopy($bgimg) ne OK) {
-                    #if replication failed try to produce eps file dynamically
-		    $bgimg=~s/\.ps$/\.eps/;
-		    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\//;
-		    print $temp_file "$newbgimg\n";
-		    $bgimg=~s/\/home\/httpd\/html\/res/\/home\/httpd\/prtspool/;		}
-	    }
-	}
-	$bgimg=~s/\/$//;
-	my $dirtywidth=$texwidth+5;
-	$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.')';
+	my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
+	my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
+	my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
+	if (!$texwidth) { $texwidth=90; }
+	$result.=&make_eps_image($bgimg,$texwidth,$h,$w);
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$Apache::edit::bgimgsrc=
@@ -158,17 +134,10 @@ 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"; }
-	$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)));
+	$count = $Apache::randomlabel::obj_cnt;
+	if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$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);
@@ -183,6 +152,70 @@ sub end_randomlabel {
     return $result;
 }
 
+sub start_bgimg {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result='';
+    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
+	&Apache::lonxml::startredirection; 
+    }
+    return $result;
+}
+
+sub end_bgimg {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result='';
+    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
+	my $bgimg=&Apache::lonxml::endredirection; 
+	if ($target eq 'web') {
+	    $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
+	    $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
+	} elsif ($target eq 'tex') {
+	    my $w=&check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval,-2));
+	    my $h=&check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval,-2));
+	    my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,-2));
+	    if (!$texwidth) { $texwidth=90; }
+	    $result.=&make_eps_image($bgimg,$texwidth,$h,$w);
+	}
+    }
+    return $result;
+}
+
+sub make_eps_image {
+    my ($bgimg,$texwidth,$h,$w)=@_;
+    my $newbgimg = $bgimg;
+    $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
+    $bgimg= &Apache::lonnet::filelocation($bgimg);
+    $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 ) {
+	    #if replication failed try to find ps file
+	    $bgimg=~s/\.eps$/\.ps/;
+	    #if no ps file try to replicate it
+	    if (not -e $bgimg &&
+		&Apache::lonnet::repcopy($bgimg) ne OK) {
+		#if replication failed try to produce eps file dynamically
+		$bgimg=~s/\.ps$/\.eps/;
+		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/|;
+		print $temp_file "$newbgimg\n";
+		$bgimg=~s|/home/httpd/html/res|/home/httpd/prtspool|;
+		$bgimg=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
+	    }
+	}
+    }
+    $bgimg=~s|/$||;
+    my $dirtywidth=$texwidth+5;
+    my $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.')';
+    return $result;
+}
+
 sub adjust_textwidth {
     my $texwidth=shift; 
     my $pagewidth=$ENV{'form.textwidth'};
@@ -255,34 +288,25 @@ sub end_labelgroup {
 	&Apache::structuretags::shuffle(\@idx_arr);
 	for(0 .. $#Apache::randomlabel::label_arr) {
 	    my $str;
-	    my $xstr;
-	    my $ystr;
 	    my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]";
 	    my $x = $Apache::randomlabel::xcoord[$_];
 	    my $y = $Apache::randomlabel::ycoord[$_];
 	    my $value = $Apache::randomlabel::value[$_];
+	    my $i=$Apache::randomlabel::obj_cnt++;
 	    if( $type eq 'text') {
 		&add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval);
-		$str = 'LB'.$Apache::randomlabel::tlabel_cnt;
-		$xstr = 'X'.$Apache::randomlabel::tlabel_cnt;
-		$ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;
-		$Apache::randomlabel::tlabel_cnt += 1;
+		$str = join(':',$x,$y,&Apache::lonnet::escape($label));
+		$args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';
 	    } elsif ( $type eq 'image') {
 		&add_vars($gname,$_,
 			  $Apache::randomlabel::description[$idx_arr[$_]],
 			  $idx_arr[$_],$value,$label,$safeeval);
-		$str = 'IMG'.$Apache::randomlabel::ilabel_cnt;
-		$xstr = 'IX'.$Apache::randomlabel::ilabel_cnt;
-		$ystr = 'IY'.$Apache::randomlabel::ilabel_cnt;
-		$Apache::randomlabel::ilabel_cnt += 1;
+		$str = join(':',$x,$y,&Apache::lonnet::escape($label));
+		$args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:';
 	    } else {
 		&Apache::lonxml::error('Unknown type of label :'.$type.':');
 	    }
-	    if ($target eq 'web') {
-		$result .= '&'. $str  .'='.&Apache::lonnet::escape($label);
-		$result .= '&'. $xstr .'='.$x;
-		$result .= '&'. $ystr .'='.$y;
-	    }
+	    if ($target eq 'web') { $args{"cgi.$cgi_id.OBJ$i"} =$str; }
 	}
     } elsif ($target eq 'tex') {
 	my $WX1=0; #  Web x-coord. of upper left corner (ULC)
@@ -378,18 +402,7 @@ sub start_label {
     my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
     if ($target eq 'web' || $target eq 'tex' ||
 	$target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
-	my $ltext=&Apache::lonxml::get_all_text("/label",$parser);
-	$ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
-	if ($type eq 'image') {
-	    &Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]");
-	    $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],
-						 $ltext);
-	    &Apache::lonxml::debug("into $ltext");
-	    my $description = &Apache::lonxml::get_param('description',
-							 $parstack,$safeeval);
-	    push(@Apache::randomlabel::description,$description);
-	}
-	push(@Apache::randomlabel::label_arr,$ltext);
+	&Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token,"$type Label");
 	my $text=&Apache::lonxml::get_all_text("/label",$parser);
@@ -404,7 +417,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 +428,7 @@ sub start_label {
 		$result = $token->[4];
 	    }
 	}
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/label",$parser);
     }
     return $result;
 }
@@ -424,7 +436,24 @@ sub start_label {
 sub end_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my @result;
-    if ($target eq 'edit') { @result=('','no') }
+    if ($target eq 'edit') {
+	@result=('','no') ;
+    } elsif ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+	     $target eq 'answer' || $target eq 'analyze') {
+	my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
+	my $ltext=&Apache::lonxml::endredirection; 
+	if ($type eq 'image') {
+	    &Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]");
+	    $ltext=&Apache::imageresponse::clean_up_image($ltext);
+#	    $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],
+#						 $ltext);
+	    &Apache::lonxml::debug("into $ltext");
+	    my $description = &Apache::lonxml::get_param('description',
+							 $parstack,$safeeval);
+	    push(@Apache::randomlabel::description,$description);
+	}
+	push(@Apache::randomlabel::label_arr,$ltext);
+    }
     return @result;
 }