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

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

Author: gsee
Date: 2012-01-04 17:17:04 +0100 (Wed, 04 Jan 2012)
New Revision: 904

Modified:
   pkg/FinancialInstrument/DESCRIPTION
   pkg/FinancialInstrument/R/saveInstruments.R
Log:
 loadInstruments was not putting metadata in the right place.

Modified: pkg/FinancialInstrument/DESCRIPTION
===================================================================
--- pkg/FinancialInstrument/DESCRIPTION	2012-01-03 21:52:07 UTC (rev 903)
+++ pkg/FinancialInstrument/DESCRIPTION	2012-01-04 16:17:04 UTC (rev 904)
@@ -11,7 +11,7 @@
     meta-data and relationships. Provides support for
     multi-asset class and multi-currency portfolios. Still
     in heavy development.
-Version: 0.10.1
+Version: 0.10.2
 URL: https://r-forge.r-project.org/projects/blotter/
 Date: $Date$
 Depends:

Modified: pkg/FinancialInstrument/R/saveInstruments.R
===================================================================
--- pkg/FinancialInstrument/R/saveInstruments.R	2012-01-03 21:52:07 UTC (rev 903)
+++ pkg/FinancialInstrument/R/saveInstruments.R	2012-01-04 16:17:04 UTC (rev 904)
@@ -66,12 +66,11 @@
         extension <- tail(ssfn, 1)
     }
 	load(paste(dir,file_name,".",extension,sep=""),envir=tmpenv)
-    #.instrument <- get("FinancialInstrument:::.instrument",pos=env)
     .instrument <- FinancialInstrument:::.instrument
     il <- ls(tmpenv$.instrument,all.names=TRUE)
     for (i in il) {
-        .instrument[[i]] <- tmpenv$.instrument[[i]]
+         assign(i, tmpenv$.instrument[[i]], pos=.instrument, inherits=FALSE)
     }
-    assign("FinancialInstrument:::.instrument", .instrument, pos=.GlobalEnv)
 }
 
+