[GT] SVN Commit r607 - trunk/GT

[GeniusTrader SVN <raphael AT geniustrader.org>]

Author: thomas
Date: 2008-04-20 05:16:40 +0200 (Sun, 20 Apr 2008)
New Revision: 607

Modified:
   trunk/GT/Tools.pm
Log:
Make alias expansion more resilient.

Modified: trunk/GT/Tools.pm
===================================================================
--- trunk/GT/Tools.pm	2008-04-20 03:15:52 UTC (rev 606)
+++ trunk/GT/Tools.pm	2008-04-20 03:16:40 UTC (rev 607)
@@ -165,7 +165,7 @@
     my ($alias) = @_;
     my $name = $alias;
     my @param;
-    if ($alias =~ m/^(.*)\[(.*)\]$/) {
+    if ($alias =~ m/^\s*(.*)\s*\[(.*)\]\s*$/) {
 	$name = $1;
 	@param = split(",", $2);
     }
@@ -181,7 +181,7 @@
          .  "\nkey looked for was \"Aliases::Global::$name\"\n";
     }
     # The alias content may list another alias ...
-    while ($sysname !~ /\|/) {
+    while ($sysname !~ /^(I|Indicators|SY|Systems|S|Signals|CS|CloseStrategy|MM|MoneyManagement|TF|TradeFilters|OF|OrderFactory|A|Analyzers|PortfolioEvaluation)/i) {
 	$sysname = resolve_alias($sysname);
     }
     my $n = 1;