[GT] SVN Commit r637 - branches/exp/GT

[GeniusTrader SVN <raphael AT geniustrader.org>]

Author: thomas
Date: 2008-06-14 07:26:24 +0200 (Sat, 14 Jun 2008)
New Revision: 637

Modified:
   branches/exp/GT/Tools.pm
Log:
Handle recursive object aliases. Fix incorrect error message in check_dates.

Modified: branches/exp/GT/Tools.pm
===================================================================
--- branches/exp/GT/Tools.pm	2008-06-14 05:25:10 UTC (rev 636)
+++ branches/exp/GT/Tools.pm	2008-06-14 05:26:24 UTC (rev 637)
@@ -243,7 +243,8 @@
 
     # Lookup the alias
     my $def = GT::Conf::get("Aliases\::$alias");
-    
+    warn "Alias $alias not found.\n";
+
     my $n = 1;
     foreach my $arg (GT::ArgsTree::args_to_ascii(@param))
     {
@@ -251,6 +252,9 @@
 	$n++;
     }
 
+    # Handle recursive object aliases
+    ($def) = GT::ArgsTree::parse_args($def) if $def =~ /@/;
+
     # Take care about operators + - / * in a string like #1+#2
     eval {
 	$def =~ s|(\d+)\*(\d+)| $1 * $2 |eg;
@@ -702,7 +706,7 @@
   my ( $s_yr, $s_mn, $s_dy, $s_tm );
   if ( $start ) {
     if ( ! parse_date_str( \$start, \$err_msg ) ) {
-      die "Error: \$err_msg\n";
+      die "Error: $err_msg\n";
     } else {
       ( $s_yr, $s_mn, $s_dy, $s_tm ) = split /[- ]/, $start;
     }
@@ -711,7 +715,7 @@
   my ( $e_yr, $e_mn, $e_dy, $e_tm );
   if ( $end ) {
     if ( ! parse_date_str( \$end, \$err_msg ) ) {
-      die "Error: \$err_msg\n";
+      die "Error: $err_msg\n";
     } else {
       ( $e_yr, $e_mn, $e_dy, $e_tm ) = split /[- ]/, $end;
     }