--- loncom/interface/lonprintout.pm	2008/02/26 10:46:14	1.515
+++ loncom/interface/lonprintout.pm	2008/03/23 23:48:45	1.519.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.515 2008/02/26 10:46:14 foxr Exp $
+# $Id: lonprintout.pm,v 1.519.2.1 2008/03/23 23:48:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::edit;
 use Apache::File();
 use Apache::lonnavmaps;
 use Apache::admannotations;
+use Apache::lonenc;
 use HTTP::Response;
 
 use LONCAPA::map();
@@ -144,30 +145,17 @@ sub ssi_with_retries {
     my ($resource, $retries, %form) = @_;
 
 
-    my $ok = 0;			# True if we got a good response.
-    my $content;
-    my $response;
-
-    # Try to get the ssi done. within the retries count:
-
-    do {
-	($content, $response) = &Apache::lonnet::ssi($resource, %form);
-	$ok      = $response->is_success;
-	$retries--;
-    } while (!$ok && ($retries > 0));
-
-    # Two cases: ok is true we have valid data, if not, retries have been exhausted
-    # if ok is true, $response->content is what we want to return.. otherwise
-    # set the error information:
-
-    if ($ok) {
-	return $content;
-    } else {
+    my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
+    if (!$response->is_success) {
 	$ssi_error               = 1;
 	$ssi_last_error_resource = $resource;
-	$ssi_last_error          = $response->code." ". $response->message;
-	return '';		# Nothing we can add to the printout that makes sense.
+	$ssi_last_error          = $response->code . " " . $response->message;
+	
+	&Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");
     }
+
+    return $content;
+
 }
 
 #
@@ -1139,6 +1127,7 @@ sub print_latex_header {
 	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
 	     '\usepackage{wrapfig}'.
 	     '\usepackage{picins}\usepackage{calc}'."\n".
+	     '\usepackage[utf8]{inputenc}'."\n".
 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
 	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
@@ -1677,6 +1666,8 @@ ENDPART
 	my $pbreakresources = keys %page_breaks;
 	for (my $i=0;$i<=$#master_seq;$i++) {
 
+            &Apache::lonenc::reset_enc();
+
 	    # Note due to document structure, not allowed to put \newpage
 	    # prior to the first resource
 
@@ -1685,11 +1676,12 @@ ENDPART
 		    $result.="\\newpage\n";
 		}
 	    }
-	    my ($sequence,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+            my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
 	    $urlp=&Apache::lonnet::clutter($urlp);
 	    $form{'symb'}=$master_seq[$i];
 
 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem
+
 	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
 	    if ($i==0) {$prevassignment=$assignment;}
 	    my $texversion='';
@@ -1996,6 +1988,9 @@ ENDPART
 	    $rndseed=$helper->{'VARS'}->{'curseed'};
 	}
 	for (my $i=0;$i<=$#list_of_files;$i++) {
+
+            &Apache::lonenc::reset_enc();
+
 	    my $urlp = $list_of_files[$i];
 	    $urlp=~s|//|/|;
 	    if ($urlp=~/\//) {
@@ -2498,6 +2493,10 @@ sub printHelper {
     $helper->declareVar("showallfoils");
     $helper->declareVar("STUDENTS");
 
+
+   
+
+
     #  The page breaks can get loaded initially from the course environment:
     # But we only do this in the initial state so that they are allowed to change.
     #
@@ -3220,19 +3219,24 @@ RNDSEED
 
 
 	    addMessage("<tr><td>Problem Type:</td><td>");
-	    $paramHash = &Apache::lonhelper::getParamHash();
-	    $paramHash->{'variable'} = 'probstatus'; # Already declared:
 	    #
 	    # Initial value from construction space:
 	    #
 	    if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
 		$helper->{VARS}->{'probstatus'} = $env{'form.problemtype'};	# initial value
 	    }
-	    $paramHash->{CHOICES} = [
-				     ['Homework problem',     'problem'],
-				     ['Exam Problem', 'exam'],
-				     ['Survey question',      'survey']];
-	    Apache::lonhelper::dropdown->new();
+	    $xmlfrag = << "PROBTYPE";
+		<dropdown variable="probstatus" multichoice="0" allowempty="0">
+		   <defaultvalue>
+		      return "$helper->{VARS}->{'probstatus'}";
+                   </defaultvalue>
+		   <choice computer="problem">Homework Problem</choice>
+		   <choice computer="exam">Exam Problem</choice>
+		   <choice computer="survey">Survey question</choice>
+		</dropdown>
+PROBTYPE
+            &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+	    
 	    addMessage("</td></tr>"); 
 
 	}