--- loncom/interface/lonprintout.pm	2003/07/14 14:30:35	1.203
+++ loncom/interface/lonprintout.pm	2003/08/13 19:38:16	1.212
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.203 2003/07/14 14:30:35 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.212 2003/08/13 19:38:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -465,16 +465,15 @@ sub page_format {
 sub get_name {
     my ($uname,$udom)=@_;
     if (!defined($uname)) { $uname=$ENV{'user.name'}; }
-    if (!defined($udom)) { $uname=$ENV{'user.domain'}; }
+    if (!defined($udom)) { $udom=$ENV{'user.domain'}; }
     my $plainname=&Apache::loncommon::plainname($uname,$udom);
     if ($plainname=~/^\s*$/) { $plainname=$uname; }
-    return &Apache::lonxml::latex_special_symbols($plainname,undef,undef,
-						  'header');
+    return &Apache::lonxml::latex_special_symbols($plainname,'header');
 }
 
 
 sub page_format_transformation {
-    my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; 
+    my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents) = @_; 
     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
 	$assignment=~s/_/ /g;
         if ($numberofcolumns != 1) {
@@ -484,10 +483,9 @@ sub page_format_transformation {
 	}
     my $name = &get_name();
     if ($name =~ /^\s*$/) {
-	$name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
-						     undef,'header');
+	$name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},'header');
     }
-    my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+    my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'header');
     if ($layout eq 'album') {
 	my $topmargintoinsert = '';
 	if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
@@ -499,6 +497,7 @@ sub page_format_transformation {
 	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
 	}
     }
+    if ($tableofcontents eq 'yes') {$text=~s/(\\begin{document})/$1 \\tableofcontents \\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/1\]\[b\]{\\hrulefill}/;}
     return $text;
 }
 
@@ -619,6 +618,7 @@ ENDPART
 	    $currentURL=$helper->{'VARS'}->{'filename'};
 	    $currentURL=~s/\/home\//\/~/;
 	    $currentURL=~s/public_html\///;
+	    if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
 	}
 	$selectionmade = 1;
 	if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
@@ -650,13 +650,15 @@ ENDPART
 		($result,$number_of_columns) = &page_cleanup($result);
 	    }
 	} else {
-#	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
-#	  if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
-#	      $result.=$1;
-#	  } else {
-#	      $result.=$ENV{'form.url'};
-#	  }
-#	  $result.=' \end{document}'
+	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+	  if ($currentURL=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
+	      $result.=$1;
+	  } elsif ($currentURL=~/\/ext\//) {
+	      $result.=' \strut \\\\ THIS IS EXTERNAL RESOURCE WITH URL \strut \\\\ '.$currentURL.' ';
+	  } else {
+	      $result.=$currentURL;
+	  }
+	  $result.=' \end{document}'
 	}
     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
@@ -710,10 +712,9 @@ ENDPART
 	    if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {
 		my $name = &get_name();
 		if ($name =~ /^\s*$/) {
-		    $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
-								 undef,'header');
+		    $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},'header');
 		}
-		my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+		my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'header');
 		$prevassignment=$assignment;
 		$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
 	    }
@@ -846,7 +847,7 @@ ENDPART
 	$result .= '\end{document}';      	
     }
 #-------------------------------------------------------- corrections for the different page formats
-    $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});
+    $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'});
     $result = &latex_corrections($number_of_columns,$result);
     #changes page's parameters for the one column output 
     if ($numberofcolumns == 1) {
@@ -855,6 +856,7 @@ ENDPART
 	$result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
 	$result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
     }
+    if ($helper->{'VARS'}->{'TABLE_CONTENTS'} eq 'yes') {$selectionmade+=10;}
 #-- writing .tex file in prtspool 
     my $temp_file;
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
@@ -864,7 +866,6 @@ ENDPART
     } 
     print $temp_file $result;
 
-#<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
 $r->print(<<FINALEND);
 <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
 </body>
@@ -900,7 +901,7 @@ sub handler {
 
     my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
     
-	my $key; 
+#	my $key; 
 #	foreach $key (keys %parmhash) {
 #	    $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
 #	}
@@ -955,8 +956,7 @@ sub printHelper {
     # This will persistently load in the data we want from the
     # very first screen.
     # Detect whether we're coming from construction space
-    if ($ENV{'form.postdata'} =~ /http:\/\// ) {
-        $ENV{'form.postdata'} =~ /http:\/\/[^\/]+\/~([^\/]+)\/(.*)/;
+    if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
         $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
         $helper->{VARS}->{'construction'} = 1;
     } else {
@@ -1107,9 +1107,10 @@ HELPERFRAGMENT
       </resource>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
-      <choice computer='0'>Start each student\'s assignment on a new page (add a pagefeed after each assignment)</choice>
-      <choice computer='1'>Add one empty page after each student\'s assignment</choice>
-      <choice computer='2'>Add two empty pages after each student\'s assignment</choice>
+      <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
+      <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
+      <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
+      <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
       </choices>
     </state>
 CHOOSE_STUDENTS
@@ -1130,7 +1131,7 @@ CHOOSE_FROM_SUBDIR
         
         $xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
       <filefilter>return $filename =~ 
-           m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
+           m/\.(problem|exam|quiz|assess|survey|form|library)$/;
       </filefilter>
       </files>
     </state>
@@ -1152,7 +1153,7 @@ CHOOSE_FROM_SUBDIR
     if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:</i></b></big><br />";
+        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:  </i></b></big>";
         Apache::lonhelper::message->new();
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'ANSWER_TYPE';   
@@ -1160,11 +1161,12 @@ CHOOSE_FROM_SUBDIR
         $paramHash->{CHOICES} = [
                                    ['Print without answer', 'yes'],
                                    ['Print with answers', 'no'] ];
-        Apache::lonhelper::choices->new();
+        Apache::lonhelper::dropdown->new();
     }
+
     if ($ENV{'request.role.adv'}) {
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Another option available only for advanced users:</i></b></big><br />";
+        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Another option available only for advanced users:  </i></b></big>";
         Apache::lonhelper::message->new();
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'LATEX_TYPE';   
@@ -1178,9 +1180,22 @@ CHOOSE_FROM_SUBDIR
 				     ['Print in LaTeX batchmode', 'batchmode'],
 				     ['Print in standard LaTeX mode', 'standard'] ];
 	}
-        Apache::lonhelper::choices->new();
+        Apache::lonhelper::dropdown->new();
     } 
 
+    
+        $paramHash = Apache::lonhelper::getParamHash();
+        $paramHash->{MESSAGE_TEXT} = "<br /><big><b>Print with <i>Table of Contents:  </i></b></big>";
+        Apache::lonhelper::message->new();
+        $paramHash = Apache::lonhelper::getParamHash();
+	$paramHash->{'variable'} = 'TABLE_CONTENTS';   
+	$helper->declareVar('TABLE_CONTENTS');         
+        $paramHash->{CHOICES} = [
+                                   ['No', 'no'],
+                                   ['Yes', 'yes'] ];
+        Apache::lonhelper::dropdown->new();
+
+
     Apache::lonprintout::page_format_state->new("FORMAT");
 
     # Generate the PAGESIZE state which will offer the user the margin