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

Diff for /loncom/interface/lonprintout.pm between versions 1.99 and 1.100

version 1.99, 2002/12/11 22:06:55 version 1.100, 2002/12/23 19:11:33
Line 66  sub headerform { Line 66  sub headerform {
 <body bgcolor="FFFFFF">  <body bgcolor="FFFFFF">
 <form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">  <form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">
 ENDHEADER  ENDHEADER
     if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) {   
     $r->print(<<ENDHEADER1);      if ($ENV{'form.postdata'}=~m|^/res/|) {
    $r->print(<<ENDHEADER1);
 <b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>  <b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>
 ENDHEADER1  ENDHEADER1
 }      }
 }  }
   
   
Line 81  sub menu_for_output { Line 82  sub menu_for_output {
     if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';}      if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';}
     if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';}      if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';}
     if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';}      if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';}
       $ENV{'form.postdata'} =~ s|http://[^/]+||;
     my $subdir_to_print = $ENV{'form.postdata'};      my $subdir_to_print = $ENV{'form.postdata'};
     $subdir_to_print =~ m/\/([^\/]+)$/;      $subdir_to_print =~ m/\/([^\/]+)$/;
     $subdir_to_print =~ s/$1//;      $subdir_to_print =~ s/\Q$1\E//;
     $r->print(<<ENDMENUOUT1);      $r->print(<<ENDMENUOUT1);
 <h1>What do you want to print? Make a choice.</h1><br />  <h1>What do you want to print? Make a choice.</h1><br />
 <input type="hidden" name="phase" value="two">  <input type="hidden" name="phase" value="two">
Line 217  sub problem_choice_menu { Line 219  sub problem_choice_menu {
     my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});      my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
     $subdirtoprint =~ s/\/[^\/]+$//;      $subdirtoprint =~ s/\/[^\/]+$//;
     my @list_of_files = ();      my @list_of_files = ();
     if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {  
  $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;  
     } else {  
  $subdirtoprint =~ s/.*(\/res\/)/$1/;  
     }  
     my @content_directory = ();      my @content_directory = ();
     if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {      if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {
  @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');   #localmachine CSTR space
    my $user=$1;
    my $domain=$Apache::lonnet::perlvar{'lonDefDomain'};
    @content_directory = &Apache::lonnet::dirlist($subdirtoprint,
         $domain, $user,'');
     } else {      } else {
  @content_directory = &Apache::lonnet::dirlist($subdirtoprint);   @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
     }      }
Line 431  ENDPART Line 432  ENDPART
  if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}   if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
  if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}   if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
     }      }
     if (($choice eq 'Standard LaTeX output for current document') && ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./)) {      if (($choice eq 'Standard LaTeX output for current document') &&
    ($ENV{'form.url'}=~m|^/~|)) {
  if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}   if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
  if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}   if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
  if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}   if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
Line 616  ENDPART Line 618  ENDPART
  $moreenv{'form.grade_target'}='tex';   $moreenv{'form.grade_target'}='tex';
  $moreenv{'form.textwidth'}=$LaTeXwidth;   $moreenv{'form.textwidth'}=$LaTeXwidth;
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
  if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {    if ($urlp =~ m|/home/([^/]+)/public_html|) {
     $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/;       $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
  }   }
  my $texversion=&Apache::lonnet::ssi($urlp);   my $texversion=&Apache::lonnet::ssi($urlp);
  &Apache::lonnet::delenv('form.grade_target','form.textwidth');   &Apache::lonnet::delenv('form.grade_target','form.textwidth');
Removed from v.1.99  
changed lines
  Added in v.1.100

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