[BACK]Return to drawimage.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/drawimage.pm between versions 1.8 and 1.10

version 1.8, 2004/09/09 07:34:48 version 1.10, 2008/03/12 02:46:52
Line 29 Line 29
 package Apache::drawimage;  package Apache::drawimage;
 use strict;  use strict;
 use Apache::loncommon;  use Apache::loncommon;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 my %args;  my %args;
 my $cgi_id;  my $cgi_id;
Line 61  sub end_drawimage { Line 64  sub end_drawimage {
                            src='/adm/randomlabel.png?token=$cgi_id' />\n";                             src='/adm/randomlabel.png?token=$cgi_id' />\n";
  $args{"cgi.$cgi_id.SIZE"}=join(':',($width,$height));   $args{"cgi.$cgi_id.SIZE"}=join(':',($width,$height));
  $args{"cgi.$cgi_id.BGCOLOR"}=join(':',($bgcolor));   $args{"cgi.$cgi_id.BGCOLOR"}=join(':',($bgcolor));
  &Apache::lonnet::appenv(%args);   &Apache::lonnet::appenv(\%args);
  if (@cgi_ids) {   if (@cgi_ids) {
     $cgi_id=pop(@cgi_ids);      $cgi_id=pop(@cgi_ids);
  } else {   } else {
Line 96  sub end_text { Line 99  sub end_text {
         my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);          my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);
         my $direction = &Apache::lonxml::get_param('direction',$parstack,$safeeval);          my $direction = &Apache::lonxml::get_param('direction',$parstack,$safeeval);
  my $text  = &Apache::lonxml::endredirection();   my $text  = &Apache::lonxml::endredirection();
         $text = &Apache::lonnet::escape($text);          $text = &escape($text);
         $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';          $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';
  my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;   my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
  $args{"cgi.$cgi_id.OBJ$i"}=join(':',($x,$y,$text,$font,$color,$direction));   $args{"cgi.$cgi_id.OBJ$i"}=join(':',($x,$y,$text,$font,$color,$direction));
Line 280  sub end_image { Line 283  sub end_image {
  my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;   my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
  $args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:';   $args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:';
  $args{"cgi.$cgi_id.OBJ$i"} =    $args{"cgi.$cgi_id.OBJ$i"} = 
     join(':',($x,$y,&Apache::lonnet::escape($bgimg),$transparent,      join(':',($x,$y,&escape($bgimg),$transparent,
       $clipx,$clipy,$scaledwidth,$scaledheight,$clipwidth,$clipheight));        $clipx,$clipy,$scaledwidth,$scaledheight,$clipwidth,$clipheight));
     }      }
     return $result;      return $result;
Removed from v.1.8  
changed lines
  Added in v.1.10

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>