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

[albertel]

albertel		Tue Sep 26 00:26:19 2006 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
  Log:
  - BUG#5027 
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.418 loncom/xml/lonxml.pm:1.419
--- loncom/xml/lonxml.pm:1.418	Tue Sep 19 14:17:18 2006
+++ loncom/xml/lonxml.pm	Tue Sep 26 00:26:15 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.418 2006/09/19 18:17:18 albertel Exp $
+# $Id: lonxml.pm,v 1.419 2006/09/26 04:26:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1654,10 +1654,10 @@
   }
   &Apache::lonxml::debug("Args are $args param is $param");
   if ($case_insensitive) {
-      if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) {
+      if (! ($args=~s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei)) {
 	  return undef;
       }
-  } elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; }
+  } elsif ( $args !~ /my .*\$\Q$param\E[,\)]/ ) { return undef; }
   my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
   &Apache::lonxml::debug("first run is $value");
   if ($value =~ /^[\$\@\%][a-zA-Z_]\w*$/) {