[Blotter-commits] r1001 - in pkg/FinancialInstrument: . R

[noreply at r-forge.r-project.org]

Author: gsee
Date: 2012-04-09 16:38:32 +0200 (Mon, 09 Apr 2012)
New Revision: 1001

Modified:
   pkg/FinancialInstrument/DESCRIPTION
   pkg/FinancialInstrument/R/load.instruments.R
Log:
 importDefaults has to be called AFTER hasArg checks.

Modified: pkg/FinancialInstrument/DESCRIPTION
===================================================================
--- pkg/FinancialInstrument/DESCRIPTION	2012-04-09 13:54:16 UTC (rev 1000)
+++ pkg/FinancialInstrument/DESCRIPTION	2012-04-09 14:38:32 UTC (rev 1001)
@@ -11,7 +11,7 @@
     meta-data and relationships. Provides support for
     multi-asset class and multi-currency portfolios. Still
     in heavy development.
-Version: 0.13.6
+Version: 0.14.0
 URL: https://r-forge.r-project.org/projects/blotter/
 Date: $Date$
 Depends:

Modified: pkg/FinancialInstrument/R/load.instruments.R
===================================================================
--- pkg/FinancialInstrument/R/load.instruments.R	2012-04-09 13:54:16 UTC (rev 1000)
+++ pkg/FinancialInstrument/R/load.instruments.R	2012-04-09 14:38:32 UTC (rev 1001)
@@ -266,7 +266,6 @@
 {
     if (is.null(date_format)) date_format <- "%Y.%m.%d"
     if (is.null(days_to_omit)) days_to_omit <- 'NULL'
-    importDefaults("getSymbols.FI")
     this.env <- environment()
     for(var in names(list(...))) {
         assign(var,list(...)[[var]], this.env)
@@ -301,6 +300,8 @@
     hasArg.days_to_omit <- hasArg(days_to_omit)
     hasArg.indexTZ <- hasArg(indexTZ)
 
+    importDefaults("getSymbols.FI")
+
     # Now get the values for each formal that we'll use if not provided
     # by the user and not found in the SymbolLookup table
     default.from <- from