Diff for /loncom/interface/lonprintout.pm between versions 1.397 and 1.400

version 1.397, 2005/10/31 21:48:07 version 1.400, 2005/12/06 03:58:14
Line 433  sub character_chart { Line 433  sub character_chart {
     $result =~ s/&(\#252|uuml);/\\\"{u}/g;      $result =~ s/&(\#252|uuml);/\\\"{u}/g;
     $result =~ s/&(\#253|yacute);/\\\'{y}/g;      $result =~ s/&(\#253|yacute);/\\\'{y}/g;
     $result =~ s/&(\#255|yuml);/\\\"{y}/g;      $result =~ s/&(\#255|yuml);/\\\"{y}/g;
       $result =~ s/&\#295;/\\ensuremath\{\\hbar\}/g;
     $result =~ s/&\#952;/\\ensuremath\{\\theta\}/g;      $result =~ s/&\#952;/\\ensuremath\{\\theta\}/g;
 #Greek Alphabet  #Greek Alphabet
     $result =~ s/&(alpha|\#945);/\\ensuremath\{\\alpha\}/g;      $result =~ s/&(alpha|\#945);/\\ensuremath\{\\alpha\}/g;
Line 907  sub unsupported { Line 908  sub unsupported {
 #  #
 # List of recently generated print files  # List of recently generated print files
 #  #
   
 sub recently_generated {  sub recently_generated {
     my $r=shift;      my $r=shift;
     my $prtspool=$r->dir_config('lonPrtDir');      my $prtspool=$r->dir_config('lonPrtDir');
     my $result;      my $zip_result;
       my $pdf_result;
     opendir(DIR,$prtspool);      opendir(DIR,$prtspool);
     while (my $filename=readdir(DIR)) {  
  if ($filename=~/^$env{'user.name'}\_$env{'user.domain'}\_printout\_(\d+)\_.*.pdf$/) {      my @files = 
     my ($cdev,$cino,$cmode,$cnlink,   grep(/^$env{'user.name'}_$env{'user.domain'}_printout_(\d+)_.*\.(pdf|zip)$/,readdir(DIR));
  $cuid,$cgid,$crdev,$csize,  
  $catime,$cmtime,$cctime,  
  $cblksize,$cblocks)=stat($prtspool.'/'.$filename);  
             $result.="<a href='/prtspool/$filename'>".  
  &mt('Generated [_1] ([_2] bytes)',  
     &Apache::lonlocal::locallocaltime($cctime),$csize).  
     '</a><br />';  
  }  
     }  
     closedir(DIR);      closedir(DIR);
     if ($result) {  
  $r->print('<h4>'.&mt('Recently generated printouts').'</h4>'."\n".      @files = sort {
   $result);   my ($actime) = (stat($prtspool.'/'.$a))[10];
    my ($bctime) = (stat($prtspool.'/'.$b))[10];
    return $bctime <=> $actime;
       } (@files);
   
       foreach my $filename (@files) {
    my ($ext) = ($filename =~ m/(pdf|zip)$/);
    my ($cdev,$cino,$cmode,$cnlink,
       $cuid,$cgid,$crdev,$csize,
       $catime,$cmtime,$cctime,
       $cblksize,$cblocks)=stat($prtspool.'/'.$filename);
    my $result="<a href='/prtspool/$filename'>".
       &mt('Generated [_1] ([_2] bytes)',
    &Apache::lonlocal::locallocaltime($cctime),$csize).
    '</a><br />';
    if ($ext eq 'pdf') { $pdf_result .= $result; }
    if ($ext eq 'zip') { $zip_result .= $result; }
       }
       if ($zip_result) {
    $r->print('<h4>'.&mt('Recently generated printout zip files')."</h4>\n"
     .$zip_result);
       }
       if ($pdf_result) {
    $r->print('<h4>'.&mt('Recently generated printouts')."</h4>\n"
     .$pdf_result);
     }      }
 }  }
   
Line 2631  STATEHTML Line 2647  STATEHTML
     $result .= "<select name='${var}.paper'>\n";      $result .= "<select name='${var}.paper'>\n";
   
     my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});      my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
     my $DefaultPaperSize=$parmhash{'default_paper_size'};      my $DefaultPaperSize=lc($parmhash{'default_paper_size'});
       $DefaultPaperSize=~s/\s//g;
     if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}      if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}
     $i = 0;      $i = 0;
     foreach (@paperSize) {      foreach (@paperSize) {

Removed from v.1.397  
changed lines
  Added in v.1.400


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