[LON-CAPA-cvs] cvs: rat / lonpage.pm

[albertel]

albertel		Mon May 21 20:26:33 2007 EDT

  Modified files:              
    /rat	lonpage.pm 
  Log:
  - fix printing in .page resource 
  
  
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.76 rat/lonpage.pm:1.77
--- rat/lonpage.pm:1.76	Tue Dec 12 13:49:27 2006
+++ rat/lonpage.pm	Mon May 21 20:26:31 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.76 2006/12/12 18:49:27 albertel Exp $
+# $Id: lonpage.pm,v 1.77 2007/05/22 00:26:31 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -270,7 +270,7 @@
 				  }
 			      }
                               my $output=Apache::lonnet::ssi($src,%posthash);
-			      $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\s||gs;
+			      $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs;
                               if ($target eq 'tex') {
 				  $output =~ s/^([^&]+)\\begin{document}//;
 				  $output =~ s/\\end{document}//;
@@ -500,13 +500,11 @@
                                       '.pageseparators'} eq 'yes') {
                                       unless($target eq 'tex') {
                                           $r->print('<hr />');
-                                      } else {
-                                          $r->print('\hline');
-                                      }
+                                      } 
 				  }
 			      } elsif ($cellemb{$rid} eq 'img') {
                                   $r->print('>'.$metainfo.'<img src="'.
-                                    $hash{'src_'.$rid}.'"></img>');
+                                    $hash{'src_'.$rid}.'" />');
 			      } elsif ($cellemb{$rid} eq 'emb') {
                                   $r->print('>'.$metainfo.'<embed src="'.
                                     $hash{'src_'.$rid}.'"></embed>');