--- loncom/interface/lonprintout.pm	2004/09/20 15:57:11	1.330
+++ loncom/interface/lonprintout.pm	2004/10/26 15:03:57	1.333
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.330 2004/09/20 15:57:11 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.333 2004/10/26 15:03:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,10 +41,7 @@ use Apache::lonnavmaps;
 use Apache::lonratedt;
 use POSIX qw(strftime);
 use Apache::lonlocal;
-use GDBM_File;
 
-
-my %hash;
 my $LaTeXwidth = 0;
 
 
@@ -1043,6 +1040,7 @@ ENDPART
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
 	    }	    
+	    if (&Apache::loncommon::connection_aborted($r)) { last; }
 	}
 	&Apache::lonnet::delenv('form.counter');
 	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
@@ -1086,6 +1084,7 @@ ENDPART
 	     $student_names[$i].=$person.':'.$fullname.'_END_';
 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
 	     $flag_latex_header_remove = 'YES';
+	     if (&Apache::loncommon::connection_aborted($r)) { last; }
 	 }
 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 	 $result .= $print_array[0].'  \end{document}';
@@ -1135,6 +1134,7 @@ ENDPART
 				       &mt('last assignment').' '.$fullname);
 	     $flag_latex_header_remove = 'YES';
 	     $count++;
+	     if (&Apache::loncommon::connection_aborted($r)) { last; }
 	 }
 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 	 $result .= $print_array[0].'  \end{document}';
@@ -1356,10 +1356,9 @@ sub print_resources {
 		    my $current_counter=$ENV{'form.counter'};
 		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-			my %form;
-			$form{'answer_output_mode'}='tex';
-			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
+			$moreenv->{'answer_output_mode'}='tex';
+			$moreenv->{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%{$moreenv});
 			&Apache::lonnet::appenv(('form.counter' => $current_counter));
 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
@@ -1402,6 +1401,7 @@ sub print_resources {
 	    }
 	    $remove_latex_header = 'YES';
 	}
+	if (&Apache::loncommon::connection_aborted($r)) { last; }
     }
     my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
@@ -1471,11 +1471,6 @@ use Data::Dumper;
 sub printHelper {
     my $r = shift;
 
-    if ($ENV{'request.course.id'}) {
-	my $fn=$ENV{'request.course.fn'};
-	tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
-    }
-
     if ($r->header_only) {
         if ($ENV{'browser.mathml'}) {
             &Apache::loncommon::content_type($r,'text/xml');
@@ -1960,9 +1955,7 @@ RNDSEED
 
     $r->print($helper->display());
 
-    Apache::lonhelper::unregisterHelperTags();
-
-    untie %hash;
+    &Apache::lonhelper::unregisterHelperTags();
 
     return OK;
 }