--- loncom/homework/randomlabel.pm	2002/05/20 20:35:13	1.28
+++ loncom/homework/randomlabel.pm	2003/05/19 17:10:12	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.28 2002/05/20 20:35:13 albertel Exp $
+# $Id: randomlabel.pm,v 1.45 2003/05/19 17:10:12 sakharuk 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,40 +82,62 @@ sub check_int {
 sub start_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class');
   push (@Apache::lonxml::namespace,'randomlabel');
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
   if ( $bgimg !~ /^http:/ ) {
-    push (@Apache::lonxml::extlinks,$bgimg);
     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
-    if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {
-      $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;
-    } elsif ($bgimg =~ m:^/home/.*/public_html:) {
-      $bgimg =~ s:^/home/(.*)/public_html:/~$1:;
+    if (&Apache::lonnet::repcopy($bgimg) ne OK) {
+	$bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
     }
-    $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg;
   }
-  my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
-  my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
   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);
-  if (!$code) { $code='GLabel.class'; }
-  if (!$codebase) { $codebase='/res/adm/includes/'; }
   $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";
+      &Apache::lonxml::startredirection();
+      $result.="BGIMG=".&Apache::lonnet::escape($bgimg);
   } elsif ($target eq 'tex') {
-    $bgimg=~s/(.gif|.jpg)$/.eps/;
-    $bgimg= &Apache::lonnet::filelocation($bgimg);
-    $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
+      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 =~ m/\/([^\/]+)$/;
+		    $bgimg = '/home/httpd/prtspool/'.$1;
+		}
+	  }
+      }
     $bgimg=~s/\/$//;
-    $result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
-    $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}(0,0)('.$texwidth.','.$texwidth*$h/$w.')'
+    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.')';
+    }
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
+    $Apache::edit::bgimgsrc=
+	&Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
+    $Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;
     $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
     $result.=&Apache::edit::browse('bgimg').' ';
     $result.=&Apache::edit::search('bgimg').'<br />'.
@@ -139,13 +163,27 @@ sub end_randomlabel {
   my $count;
   pop @Apache::lonxml::namespace;
   if ($target eq 'web') {
-    $count = $Apache::randomlabel::tlabel_cnt;
-    if( $count != 0) { $result.= "<param name=\"COUNT\" value=\"$count\">\n"; }
-    $count = $Apache::randomlabel::ilabel_cnt;
-    if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
-    $result .= "</applet>\n<BR />";
+      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)));
   } elsif ($target eq 'tex') {
-    $result='\end{picture}\\\\';
+      $result='\end{picture}\\\\';
+	  @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
+      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;
   }
@@ -158,8 +196,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 = ();
@@ -207,7 +245,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) {
@@ -236,9 +275,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  .'='.&Apache::lonnet::escape($label);
+	$result .= '&'. $xstr .'='.$x;
+	$result .= '&'. $ystr .'='.$y;
       }
     }
   } elsif ($target eq 'tex') {
@@ -267,11 +306,11 @@ sub end_labelgroup {
       my $x = $Apache::randomlabel::xcoord[$i];
       my $y = $Apache::randomlabel::ycoord[$i];
       my $value = $Apache::randomlabel::value[$i];
-#      my $tcX=$x*($texwidth/$wwidth) - $texwidth;
-      my $tcX=($x-10)*($texwidth/$wwidth);
-#      my $tcY=$TY1-$y*($TY1/$wheight)-2;
-      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
-      my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
+      #x latex coordinate
+      my $tcX=($x)*($texwidth/$wwidth);
+      #y latex coordinate
+#      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";
@@ -305,6 +344,7 @@ sub start_location {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('X:','x',$token,4).
       &Apache::edit::text_arg('Y:','y',$token,4).
+      &Apache::edit::entercoords('x','y','attribute','width','height').'&nbsp;&nbsp;&nbsp;'.
 	&Apache::edit::text_arg('Value:','value',$token).
 	  &Apache::edit::end_row();
     $result.=&Apache::edit::end_table;
@@ -331,13 +371,13 @@ 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') {
-    my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
+  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 and $Apache::lonxml::pwd[-1]");
-      $ltext="http://$ENV{'SERVER_NAME'}".&Apache::lonnet::hreflocation($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',
@@ -347,14 +387,14 @@ sub start_label {
     push(@Apache::randomlabel::label_arr,$ltext);
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"$type Label");
-    my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
+    my $text=&Apache::lonxml::get_all_text("/label",$parser);
     if ($type eq 'image') {
       $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       $result.=&Apache::edit::text_arg('Description:','description',$token);
     }
     if ($type eq 'text') { $result.="Label Text:"; }
-    if ($type eq 'image') { $result.="Path to image:"; }
-    $result.=&Apache::edit::editline('',$text,'',20).
+    if ($type eq 'image') { $result.="Path to image:&nbsp;"; }
+    $result.=&Apache::edit::editline('',$text,'',50).
       &Apache::edit::end_table();
   } elsif ($target eq 'modified') {
     my $text=$$parser[-1]->get_text("/label");