--- loncom/homework/randomlabel.pm	2002/07/30 16:12:38	1.32
+++ 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.32 2002/07/30 16:12:38 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.39 2002/11/07 19:48:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,8 @@ package Apache::randomlabel;
 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'));
@@ -80,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);
@@ -91,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);
@@ -103,24 +106,46 @@ 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/;
     $bgimg= &Apache::lonnet::filelocation($bgimg);
     if (not $ENV{'request.role'}=~/^au\./) {
 	$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 =~ m/\/([^\/]+)$/;
+		    $bgimg = '/home/httpd/prtspool/'.$1;
+		}
+	    }
+	}
     } else {
 	$bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/;
-
     }
     $bgimg=~s/\/$//;
+    my $dirtywidth=$texwidth+5;
     if ($texwidth==90) {
-	$result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
-	    $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$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.')';
     } else {
-	$result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
-	    $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')('.(100-$texwidth).','.(100-$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);
@@ -147,20 +172,26 @@ 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}\\\\';
-      if (@$parstack[-1]=~/\$texwidth\s*=\s*?"90/) { #"
 	  @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
-	  my $howtoskipback = $1/48;
-	  $result.=' \vskip -'.$howtoskipback.' cm ';
-      }
+      my $one=$1;
+	  @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;
+      my $two=$1;
+	  @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;
+      my $three=$1;
+      my $howtoskipback = $three*$one/$two;
+      $result.=' \vskip -'.$howtoskipback.' mm }';
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table;
   }
@@ -173,8 +204,8 @@ sub start_labelgroup {
   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
   $type =~tr/A-Z/a-z/;
-  if ($target eq 'web' || $target eq 'tex' || 
-      $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'tex' ||
+      $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
     $Apache::randomlabel::groupname=$name;
     $Apache::randomlabel::type=$type;
     @Apache::randomlabel::xcoord = ();
@@ -222,7 +253,8 @@ sub end_labelgroup {
   my $gname = $Apache::randomlabel::groupname;
   my $type  = $Apache::randomlabel::type;
   my $result='';
-  if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'answer' || $target eq 'grade' ||
+      $target eq 'analyze') {
     my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
     &Apache::structuretags::shuffle(\@idx_arr);
     for(0 .. $#Apache::randomlabel::label_arr) {
@@ -251,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') {
@@ -283,10 +315,10 @@ sub end_labelgroup {
       my $y = $Apache::randomlabel::ycoord[$i];
       my $value = $Apache::randomlabel::value[$i];
       #x latex coordinate
-      my $tcX=($x-5)*($texwidth/$wwidth);
+      my $tcX=($x)*($texwidth/$wwidth);
       #y latex coordinate
-      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
-      my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
+#      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
+      my $tcY=$TY1-$y*($TY1/$wheight);
       $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
@@ -346,8 +378,8 @@ sub start_label {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
-  if ($target eq 'web' || $target eq 'tex' || 
-      $target eq 'grade' || $target eq 'answer') {
+  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[-1]);
     $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
     if ($type eq 'image') {