From 6636fb1fca19505cabd5b69aedfb20c06d46012a Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 20 Aug 2008 16:47:39 +0000 Subject: [PATCH] -Fix regular expression without arithmetic expansion in ||| git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2046 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Table.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm index 1eaef9a3a..cc532bbe0 100644 --- a/perl-xCAT/xCAT/Table.pm +++ b/perl-xCAT/xCAT/Table.pm @@ -1042,9 +1042,11 @@ sub getNodeAttribs ($curr, $next, $prev) = extract_bracketed($retval, '()', qr/[^()]*/); - unless($curr) { + unless($curr) { #If there were no paramaters to save, treat this one like a plain regex $retval = $node; $retval =~ s/$parts[0]/$parts[1]/; + $datum->{$attrib} = $retval; + next; #skip the redundancy that follows otherwise } while ($curr) { @@ -1065,6 +1067,8 @@ sub getNodeAttribs ($curr, $next, $prev) = extract_bracketed($retval, '()', qr/[^()]*/); } + #At this point, $retval is the expression after being arithmetically contemplated, a generated regex, and therefore + #must be applied in total my $answval = $node; $answval =~ s/$parts[0]/$retval/; $datum->{$attrib} = $answval; #$retval;