[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

foxr lon-capa-cvs@mail.lon-capa.org
Tue, 17 May 2005 23:12:01 -0000


foxr		Tue May 17 19:12:01 2005 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Fix a regression error that caused images to fail to be queued
  for conversion to eps... due to operator precedence problems in a test.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.269 loncom/xml/londefdef.pm:1.270
--- loncom/xml/londefdef.pm:1.269	Fri Apr 29 17:22:33 2005
+++ loncom/xml/londefdef.pm	Tue May 17 19:11:59 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.269 2005/04/29 21:22:33 albertel Exp $
+# $Id: londefdef.pm,v 1.270 2005/05/17 23:11:59 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -3854,9 +3854,11 @@
 	    #if replication failed try to find ps file
 	    $src=~s/\.eps$/\.ps/;
 	    &Apache::lonxml::debug("Now looking for $src");
-	    #if no ps file try to replicate it
-	    if (not -e $src ||
-		&Apache::lonnet::repcopy($src) ne 'ok') {
+	    #if no ps file try to replicate it.
+	    my $didrepcopy = &Apache::lonnet::repcopy($src);
+	    &Apache::lonxml::debug("repcopy of $src ... $didrepcopy");
+	    if ( (not -e $src) ||
+		($didrepcopy ne 'ok')) {
 		&Apache::lonxml::debug("Failed to find or replicate $src");
 
 		#if replication failed try to produce eps file dynamically