[LON-CAPA-cvs] cvs: loncom(bz5969) /interface lonprintout.pm

[foxr]

foxr		Thu Jul 16 11:12:30 2009 EDT

  Modified files:              (Branch: bz5969)
    /loncom/interface	lonprintout.pm 
  Log:
  First successes at getting .page to print in a course.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.557.2.2 loncom/interface/lonprintout.pm:1.557.2.3
--- loncom/interface/lonprintout.pm:1.557.2.2	Tue Jul 14 11:08:00 2009
+++ loncom/interface/lonprintout.pm	Thu Jul 16 11:12:30 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.557.2.2 2009/07/14 11:08:00 foxr Exp $
+# $Id: lonprintout.pm,v 1.557.2.3 2009/07/16 11:12:30 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1344,10 +1344,11 @@
 	$currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
 	my $title=&Apache::lonnet::gettitle($symb);
 	$title = &Apache::lonxml::latex_special_symbols($title);
-	$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';
     } else {
 	$result.=$currentURL;
     }
+    $result .= '\\\\';
+
     if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
 	&Apache::lonnet::appenv({'construct.style' =>
 				$helper->{'VARS'}->{'style_file'}});
@@ -1359,11 +1360,11 @@
     # components of the page. Each of which must be printed independently.
 
     my $the_page = shift(@page_resources); 
-    $result .= "URL: $currentURL " .'\\\\';
 
     foreach my $resource (@page_resources) {
 	my $resource_src   = $resource->src(); # Essentially the URL of the resource.
-	
+	$result           .= $resource->title() . '\\\\';
+
 	# Recurse if a .page:
 
 	if ($resource_src =~ /.page$/i) {
@@ -1408,6 +1409,10 @@
 
 	    my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
 
+	    # There seems to be an extraneous \vskip 1mm \\\\ :
+
+	    $texversion =~ s/^\\vskip 1mm \\\\\\\\//;
+
 	    # current document with answers.. no need to encap in minipage
 	    #  since there's only one answer.