--- loncom/interface/lonprintout.pm	2005/11/15 12:37:11	1.399
+++ loncom/interface/lonprintout.pm	2005/12/06 15:01:45	1.402
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.399 2005/11/15 12:37:11 albertel Exp $
+# $Id: lonprintout.pm,v 1.402 2005/12/06 15:01:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -908,28 +908,43 @@ sub unsupported {
 #
 # List of recently generated print files
 #
-
 sub recently_generated {
     my $r=shift;
     my $prtspool=$r->dir_config('lonPrtDir');
-    my $result;
+    my $zip_result;
+    my $pdf_result;
     opendir(DIR,$prtspool);
-    while (my $filename=readdir(DIR)) {
-	if ($filename=~/^$env{'user.name'}\_$env{'user.domain'}\_printout\_(\d+)\_.*.pdf$/) {
-	    my ($cdev,$cino,$cmode,$cnlink,
-		$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 />';
-	}
-    }
+
+    my @files = 
+	grep(/^$env{'user.name'}_$env{'user.domain'}_printout_(\d+)_.*\.(pdf|zip)$/,readdir(DIR));
     closedir(DIR);
-    if ($result) {
-	$r->print('<h4>'.&mt('Recently generated printouts').'</h4>'."\n".
-		  $result);
+
+    @files = sort {
+	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);
     }
 }
 
@@ -990,7 +1005,9 @@ $html
 <title>LON-CAPA output for printing</title>
 </head>
 $bodytag
+<p>
 Please stand by while processing your print request, this may take some time ...
+</p>
 ENDPART
 
 
@@ -1094,6 +1111,9 @@ ENDPART
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
 		$form{'rndseed'}=$rndseed;
+                if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {
+		    $form{'problemtype'}='exam';
+		}
 		$resources_printed .= $currentURL.':';
 		my $answer=&Apache::lonnet::ssi($currentURL,%form);
 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {