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

version 1.32, 2003/09/08 18:36:39 version 1.38, 2005/04/07 06:56:22
Line 33  use Apache::lonnet; Line 33  use Apache::lonnet;
 use POSIX qw(strftime);  use POSIX qw(strftime);
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight'));      &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight','displaystudentphoto'));
 }  }
   
 sub initialize_outputtags {  sub initialize_outputtags {
Line 65  sub start_displayduedate { Line 65  sub start_displayduedate {
  &Apache::lonnavmaps::timeToHumanString($date).   &Apache::lonnavmaps::timeToHumanString($date).
  '</td></tr></table>';   '</td></tr></table>';
  } else {   } else {
     $result='Due '.&Apache::lonnavmaps::timeToHumanString($date);      $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
  }   }
 #        } else {  #        } else {
 #    $result ='<table border="on"><tr><td>No due date set.</td></tr></table>';  #    $result ='<table border="on"><tr><td>No due date set.</td></tr></table>';
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 145  sub start_displayweight { Line 145  sub start_displayweight {
     }      }
     push(@{$Apache::outputtags::showonce{'displayweight'}},      push(@{$Apache::outputtags::showonce{'displayweight'}},
  $Apache::inputtags::part);   $Apache::inputtags::part);
     my $status=$Apache::inputtags::status['-1'];  
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  my $id = $Apache::inputtags::part;   my $id = $Apache::inputtags::part;
  if ($id ne '0') {   if ($id ne '0') {
Line 153  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 179  sub end_displayweight { Line 178  sub end_displayweight {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result;      my @result;
     if ($target eq 'edit') { $result[1]='no'; }      if ($target eq 'edit') { $result[1]='no'; }
       return @result;
   }
   
   sub start_displaystudentphoto {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
       if ($target eq 'web' && $user eq $env{'user.name'}) {
    my $url=&Apache::lonnet::studentphoto($domain,$user,"gif");
    my $args;
    my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
    if ($width) { $args.=" width=\"$width\" "; }
    my $height=&Apache::lonxml::get_param('heigth',$parstack,$safeeval);
    if ($height) { $args.=" height=\"$height\" "; }
    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/) {
    my $url=&Apache::lonnet::studentphoto($domain,$user,"eps");
    my $ua=new LWP::UserAgent;
    my $request=new HTTP::Request('GET',$url);
    my $response=$ua->request($request);
    if ($response->is_success) {
       my $file=$user."_".$domain."_studentphoto.eps";
       open(FILE,">".$Apache::lonnet::perlvar{'lonPrtDir'}."/$file");
       print FILE $response->content;
       close(FILE);
       my $width_param=&Apache::londefdef::image_size($Apache::lonnet::perlvar{'lonPrtDir'}."/$file",'0.3',$parstack,$safeeval);
       $result.=' \graphicspath{{'.$Apache::lonnet::perlvar{'lonPrtDir'}.
    '}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
    } else {
       $result="$user\@$domain";
    }
       }
       return $result;
   }
   
   sub end_displaystudentphoto {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my @result;
       if ($target eq 'edit') { $result[1]='no'; }
     return @result;      return @result;
 }  }
   

Removed from v.1.32  
changed lines
  Added in v.1.38


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