loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.212 and 1.213

-version 1.212, 2002/11/06 23:05:02
+version 1.213, 2002/11/07 19:33:52
  Line 1354  sub warning {
  }
  sub get_param {
-   my ($param,$parstack,$safeeval,$context) = @_;
+     my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;
-   if ( ! $context ) { $context = -1; }
+     if ( ! $context ) { $context = -1; }
-   my $args ='';
+     my $args ='';
-   if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+     if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
-   if ( ! $args ) { return undef; }
+     if ( ! $args ) { return undef; }
-   if ( $args =~ /my \$$param=\"/ ) {
+     if ( $case_insensitive ) {
-     return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
+ 	if ($args =~ s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei) {
-   } else {
+ 	    return &Apache::run::run("{$args;".'return $'.$param.'}',
-     return undef;
+                                      $safeeval); #'
-   }
+ 	} else {
+ 	    return undef;
+ 	}
+     } else {
+ 	if ( $args =~ /my \$\Q$param\E=\"/ ) {
+ 	    return &Apache::run::run("{$args;".'return $'.$param.'}',
+                                      $safeeval); #'
+ 	} else {
+ 	    return undef;
+ 	}
+     }
  }
  sub get_param_var {
-   my ($param,$parstack,$safeeval,$context) = @_;
+   my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;
    if ( ! $context ) { $context = -1; }
    my $args ='';
    if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
-   if ( $args !~ /my \$$param=\"/ ) { return undef; }
+   if ($case_insensitive) {
+       if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) {
+ 	  return undef;
+       }
+   } elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; }
    my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
    if ($value =~ /^[\$\@\%]/) {
      return &Apache::run::run("return $value",$safeeval,1);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.212
changed lines
	Added in v.1.213