[LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm

[raeburn]

raeburn		Fri Jan 26 17:16:35 2007 EDT

  Modified files:              
    /loncom/publisher	lonpublisher.pm 
  Log:
  1. Add missing ;
  
  2. In cases where <image></image> encloses a definition of a dynamic plot via <gnuplot></gnuplot> rather than an actual image file form RES space, a spurious dependency on the user's top level directory could be added on publication because of line feeds.
  
  
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.217 loncom/publisher/lonpublisher.pm:1.218
--- loncom/publisher/lonpublisher.pm:1.217	Fri Jan 19 01:10:09 2007
+++ loncom/publisher/lonpublisher.pm	Fri Jan 26 17:16:33 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.217 2007/01/19 06:10:09 albertel Exp $
+# $Id: lonpublisher.pm,v 1.218 2007/01/26 22:16:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -471,7 +471,7 @@
 	($newurl !~ /^\#/)) {
 	$$allow{&absoluteurl($newurl,$target)}=1;
     }
-    return $return_url
+    return $return_url;
 }
 
 #########################################
@@ -714,6 +714,7 @@
 		    ($lctag eq 'image')) {
 		    my $next_token=$parser[-1]->get_token();
 		    if ($next_token->[0] eq 'T') {
+                        $next_token->[1] =~ s/[\n\r\f]+//g;
 			$next_token->[1]=&set_allow(\%allow,$logfile,
 						    $target,$tag,
 						    $next_token->[1]);