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

Diff for /loncom/homework/outputtags.pm between versions 1.35 and 1.38

version 1.35, 2004/10/26 15:03:08 version 1.38, 2005/04/07 06:56:22
Line 122  sub end_displaytitle { Line 122  sub end_displaytitle {
   
 sub multipart {  sub multipart {
     my ($uri)=@_;      my ($uri)=@_;
     if (!defined($uri)) { $uri=$ENV{'request.uri'}; }      if (!defined($uri)) { $uri=$env{'request.uri'}; }
     my @parts;      my @parts;
     my $metadata = &Apache::lonnet::metadata($uri,'packages');      my $metadata = &Apache::lonnet::metadata($uri,'packages');
     foreach (split(/\,/,$metadata)) {      foreach (split(/\,/,$metadata)) {
Line 152  sub start_displayweight { Line 152  sub start_displayweight {
     if (!defined($weight) || ($weight eq '')) { $weight=1; }      if (!defined($weight) || ($weight eq '')) { $weight=1; }
     $result.=$weight;      $result.=$weight;
  } else {   } else {
     my @parts=&multipart($ENV{'request.uri'});      my @parts=&multipart($env{'request.uri'});
     my $weight;      my $weight;
     if (@parts) {      if (@parts) {
         foreach my $part (@parts) {          foreach my $part (@parts) {
Line 185  sub start_displaystudentphoto { Line 185  sub start_displaystudentphoto {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();      my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
     if ($target eq 'web' && $user eq $ENV{'user.name'}) {      if ($target eq 'web' && $user eq $env{'user.name'}) {
  my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:gif",&Apache::lonnet::homeserver($user,$domain));   my $url=&Apache::lonnet::studentphoto($domain,$user,"gif");
  my $url="/uploaded/$domain/$user/internal/studentphoto.gif";  
  my $tokenurl=&Apache::lonnet::tokenwrapper($url);  
  my $args;   my $args;
  my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);   my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
  if ($width) { $args.=" width=\"$width\" "; }   if ($width) { $args.=" width=\"$width\" "; }
  my $height=&Apache::lonxml::get_param('heigth',$parstack,$safeeval);   my $height=&Apache::lonxml::get_param('heigth',$parstack,$safeeval);
  if ($height) { $args.=" height=\"$height\" "; }   if ($height) { $args.=" height=\"$height\" "; }
  $result.=" <img $args src=\"$tokenurl\" alt=\"$user\@$domain\" />";   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval);
    if ($align) { $args.=" align=\"$align\" "; }
    $result.=" <img $args src=\"$url\" alt=\"$user\@$domain\" />";
     }      }
     if ($target eq 'tex' && $ENV{'request.role'} =~ /^cc/) {      if ($target eq 'tex' && $env{'request.role'} =~ /^cc/) {
  my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:eps",&Apache::lonnet::homeserver($user,$domain));   my $url=&Apache::lonnet::studentphoto($domain,$user,"eps");
  my $url="/uploaded/$domain/$user/internal/studentphoto.eps";  
  my $tokenurl=&Apache::lonnet::tokenwrapper($url);  
  my $ua=new LWP::UserAgent;   my $ua=new LWP::UserAgent;
  my $request=new HTTP::Request('GET',$tokenurl);   my $request=new HTTP::Request('GET',$url);
  my $response=$ua->request($request);   my $response=$ua->request($request);
  if ($response->is_success) {   if ($response->is_success) {
     my $file=$user."_".$domain."_studentphoto.eps";      my $file=$user."_".$domain."_studentphoto.eps";
Line 211  sub start_displaystudentphoto { Line 209  sub start_displaystudentphoto {
     my $width_param=&Apache::londefdef::image_size($Apache::lonnet::perlvar{'lonPrtDir'}."/$file",'0.3',$parstack,$safeeval);      my $width_param=&Apache::londefdef::image_size($Apache::lonnet::perlvar{'lonPrtDir'}."/$file",'0.3',$parstack,$safeeval);
     $result.=' \graphicspath{{'.$Apache::lonnet::perlvar{'lonPrtDir'}.      $result.=' \graphicspath{{'.$Apache::lonnet::perlvar{'lonPrtDir'}.
  '}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';   '}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
    } else {
       $result="$user\@$domain";
  }   }
     }      }
     return $result;      return $result;
Removed from v.1.35  
changed lines
  Added in v.1.38

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