[Blotter-commits] r908 - in pkg/FinancialInstrument: R inst/parser

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

Author: gsee
Date: 2012-01-07 21:24:35 +0100 (Sat, 07 Jan 2012)
New Revision: 908

Modified:
   pkg/FinancialInstrument/R/saveInstruments.R
   pkg/FinancialInstrument/inst/parser/TRTH_BackFill.R
Log:
 - require(utils) in loadInstruments for smoother addition to RProfile
 - .TRTH$files.gz instead of files.gz


Modified: pkg/FinancialInstrument/R/saveInstruments.R
===================================================================
--- pkg/FinancialInstrument/R/saveInstruments.R	2012-01-06 21:51:43 UTC (rev 907)
+++ pkg/FinancialInstrument/R/saveInstruments.R	2012-01-07 20:24:35 UTC (rev 908)
@@ -57,6 +57,7 @@
 #' @export
 #' @rdname saveInstruments
 loadInstruments <-function(file_name="MyInstruments", dir="", extension="RData") {
+    require("utils")
 	if (!is.null(dir) && !dir == "" && substr(dir,nchar(dir),nchar(dir)) != "/")
 		dir <- paste(dir,"/",sep="")
     tmpenv <- new.env()

Modified: pkg/FinancialInstrument/inst/parser/TRTH_BackFill.R
===================================================================
--- pkg/FinancialInstrument/inst/parser/TRTH_BackFill.R	2012-01-06 21:51:43 UTC (rev 907)
+++ pkg/FinancialInstrument/inst/parser/TRTH_BackFill.R	2012-01-07 20:24:35 UTC (rev 908)
@@ -195,7 +195,7 @@
     Reuters.output <-  Reuters[-c(grep("report",Reuters),grep("confirmation",Reuters))]
     Reuters.output <-  Reuters.output[grep(.TRTH$job.name, Reuters.output)]
 
-    files.gz <- Reuters.output[!(Reuters.output %in% Archive.output)]
+    .TRTH$files.gz <- Reuters.output[!(Reuters.output %in% Archive.output)]
     #files.gz <- paste(username, "-", job.name, ".csv.gz", sep="")
     
     if (length(.TRTH$files.gz) == 0) .TRTH$files.gz <- Reuters.output