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

Diff for /loncom/interface/lonprintout.pm between versions 1.600 and 1.601

version 1.600, 2011/10/21 10:13:57 version 1.601, 2011/10/26 02:09:42
Line 1929  sub print_page_in_course { Line 1929  sub print_page_in_course {
     } else {      } else {
  $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';   $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
  my $URLpath=$urlp;   my $URLpath=$urlp;
  $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;   #$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
  $texversion.=&path_to_problem($URLpath,$LaTeXwidth);   $texversion.=&path_to_problem($URLpath,$LaTeXwidth);
     }      }
     $texversion.='\vskip 1 mm '.$answer.'\end{document}';      $texversion.='\vskip 1 mm '.$answer.'\end{document}';
Line 2269  sub print_construction_sequence { Line 2269  sub print_construction_sequence {
     # IF sequence, recurse:      # IF sequence, recurse:
           
     if ($urlp =~ /\.sequence$/) {      if ($urlp =~ /\.sequence$/) {
   #
   # FIXME: this does not work for co-authors
  my $sequence_url = $urlp;   my $sequence_url = $urlp;
  my $domain       = $env{'user.domain'}; # Constr. space only on local   my $domain       = $env{'user.domain'}; # Constr. space only on local
  my $user         = $env{'user.name'};   my $user         = $env{'user.name'};
   # FIXME: the substitutions below do not seem to make sense
  $sequence_url    =~ s/^\/res\/$domain/\/home/;   $sequence_url    =~ s/^\/res\/$domain/\/home/;
  $sequence_url    =~ s/^(\/home\/$user)/$1\/public_html/;   $sequence_url    =~ s/^(\/home\/$user)/$1\/public_html/;
 # $sequence_url    =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;  # $sequence_url    =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
Line 2515  ENDPART Line 2517  ENDPART
     } else {      } else {
  $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';   $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
  my $URLpath=$cleanURL;   my $URLpath=$cleanURL;
   # FIXME: unclear URL path, not sure when this would occur
  $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;   $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
  $texversion.=&path_to_problem($URLpath,$LaTeXwidth);   $texversion.=&path_to_problem($URLpath,$LaTeXwidth);
     }      }
Line 2550  ENDPART Line 2553  ENDPART
  && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {   && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {
             #printing content of sequence from the construction space              #printing content of sequence from the construction space
   
   # FIXME: unclear how this would work
     $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;      $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
     $result .= &print_construction_sequence($currentURL, $helper, %form,      $result .= &print_construction_sequence($currentURL, $helper, %form,
     $LaTeXwidth);      $LaTeXwidth);
Removed from v.1.600  
changed lines
  Added in v.1.601

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