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

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 26 Feb 2004 22:08:55 -0000


albertel		Thu Feb 26 17:08:55 2004 EDT

  Modified files:              
    /loncom/xml	run.pm 
  Log:
  - BUG#2414
  
  
Index: loncom/xml/run.pm
diff -u loncom/xml/run.pm:1.43 loncom/xml/run.pm:1.44
--- loncom/xml/run.pm:1.43	Thu Jan 29 13:46:25 2004
+++ loncom/xml/run.pm	Thu Feb 26 17:08:54 2004
@@ -1,6 +1,6 @@
 package Apache::run;
 #
-# $Id: run.pm,v 1.43 2004/01/29 18:46:25 albertel Exp $
+# $Id: run.pm,v 1.44 2004/02/26 22:08:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,7 @@
   my %_LONCAPA_INTERNAL_oldexpressions=();
   while (!$_LONCAPA_INTERNAL_oldexpressions{$_}) {
     $_LONCAPA_INTERNAL_oldexpressions{$_}=1;
-    $_ =~s/((?:\$|\&)(?:[\#|\$]*[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[\{][^\$\&\]\}]+[\]\}])*?(\([^\$\&\)]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg;
+    $_ =~s/((?:\$|\&)(?:(?:\#\$|\#)?[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[\{][^\$\&\]\}]+[\]\}])*?(\([^\$\&\)]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg;
     if (scalar(values(%_LONCAPA_INTERNAL_oldexpressions))>10) {last;}
   }
 ENDEVALUATE