--- loncom/homework/randomlabel.pm	2002/10/14 20:37:27	1.37
+++ loncom/homework/randomlabel.pm	2002/11/07 19:48:51	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.37 2002/10/14 20:37:27 albertel Exp $
+# $Id: randomlabel.pm,v 1.39 2002/11/07 19:48:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,6 +61,7 @@ use Apache::lonnet;
 use strict;
 use Apache::edit;
 use Apache::File();
+use Apache::Constants qw(:common :http);
 
 BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
@@ -81,6 +82,7 @@ sub check_int {
 sub start_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
+  &Apache::lonxml::startredirection();
   push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class');
   push (@Apache::lonxml::namespace,'randomlabel');
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
@@ -92,7 +94,7 @@ sub start_randomlabel {
     } elsif ($bgimg =~ m:^/home/.*/public_html:) {
       $bgimg =~ s:^/home/(.*)/public_html:/~$1:;
     }
-    $bgimg='http://'.$ENV{'SERVER_NAME'}.$bgimg;
+#    $bgimg='http://'.$ENV{'SERVER_NAME'}.$bgimg;
   }
   my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
@@ -104,8 +106,8 @@ sub start_randomlabel {
   $Apache::randomlabel::tlabel_cnt=0;
   $Apache::randomlabel::ilabel_cnt=0;
   if ($target eq 'web') {
-    $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">\n";
-    $result.="<param name=\"bgimg\" value=\"$bgimg\">\n";
+    $result.='<img src="/cgi-bin/randomlabel.png?';
+    $result.="BGIMG=".&Apache::lonnet::escape('/home/httpd/html/'.$bgimg);
   } elsif ($target eq 'tex') {
     my $newbgimg = $bgimg;
     $bgimg=~s/(.gif|.jpg)$/.eps/;
@@ -115,14 +117,13 @@ sub start_randomlabel {
 	$bgimg=~s/\/$//;
         #if no eps file try to replicate it
 	if (not-e $bgimg) {
-	    my $response = &Apache::lonnet::repcopy($bgimg);
-            #if replication failed try to find ps file
-	    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) {
-		    $response = &Apache::lonnet::repcopy($bgimg);
-		    #if replication failed try to produce eps file dynamically
+		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";
@@ -171,15 +172,18 @@ sub end_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   my $count;
+  $result=&Apache::lonxml::endredirection();
+  $result=~s/\s*&/&/g;
+  $result=~s/\s*$//;
   pop @Apache::lonxml::namespace;
   if ($target eq 'web') {
     $count = $Apache::randomlabel::tlabel_cnt;
-    if( $count != 0) { $result.= "<param name=\"COUNT\" value=\"$count\">\n"; }
+    if( $count != 0) { $result.= "&COUNT=$count"; }
     $count = $Apache::randomlabel::ilabel_cnt;
-    if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
-    $result .= "</applet>\n<BR />";
+    if( $count != 0) { $result.= "&ICOUNT=$count"; }
+    $result.='" /><br />'."\n";
   } elsif ($target eq 'tex') {
-      $result='\end{picture}\\\\}';
+      $result='\end{picture}\\\\';
 	  @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
       my $one=$1;
 	  @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;
@@ -187,7 +191,7 @@ sub end_randomlabel {
 	  @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;
       my $three=$1;
       my $howtoskipback = $three*$one/$two;
-      $result.=' \vskip -'.$howtoskipback.' mm ';
+      $result.=' \vskip -'.$howtoskipback.' mm }';
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table;
   }
@@ -279,9 +283,9 @@ sub end_labelgroup {
 	&Apache::lonxml::error('Unknown type of label :'.$type.':');
       }
       if ($target eq 'web') {
-	$result .= '<param name="' . $str  . '" value="'.$label.'">';
-	$result .= '<param name="' . $xstr . '" value="'.$x.'">';
-	$result .= '<param name="' . $ystr . '" value="'.$y.'">'."\n";
+	$result .= '&'. $str  .'='.$label;
+	$result .= '&'. $xstr .'='.$x;
+	$result .= '&'. $ystr .'='.$y;
       }
     }
   } elsif ($target eq 'tex') {