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

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

Author: gsee
Date: 2013-02-05 02:14:43 +0100 (Tue, 05 Feb 2013)
New Revision: 1389

Modified:
   pkg/FinancialInstrument/DESCRIPTION
   pkg/FinancialInstrument/NEWS
   pkg/FinancialInstrument/R/load.instruments.R
Log:
 setSymbolLookup.FI does not append Symbol to file path. Please test.

Modified: pkg/FinancialInstrument/DESCRIPTION
===================================================================
--- pkg/FinancialInstrument/DESCRIPTION	2013-02-02 21:54:49 UTC (rev 1388)
+++ pkg/FinancialInstrument/DESCRIPTION	2013-02-05 01:14:43 UTC (rev 1389)
@@ -9,7 +9,7 @@
 Contributors: Dirk Eddelbuettel, Alexis Petit, Jeffrey Ryan, Joshua Ulrich
 Description: Infrastructure for defining meta-data and
     relationships for financial instruments.
-Version: 1.1.3
+Version: 1.1.4
 URL: https://r-forge.r-project.org/projects/blotter/
 Date: 2013-02-02
 Depends:

Modified: pkg/FinancialInstrument/NEWS
===================================================================
--- pkg/FinancialInstrument/NEWS	2013-02-02 21:54:49 UTC (rev 1388)
+++ pkg/FinancialInstrument/NEWS	2013-02-05 01:14:43 UTC (rev 1389)
@@ -4,8 +4,12 @@
 BUG FIXES
 ---------
 
-* If the end of dir was the same as Symbol, getSymbols.FI had trouble finding 
-  the files.  Test added.
+* setSymbolLookup.FI was appending the Symbol to the directory, and 
+  getSymbols.FI was only adding the Symbol to the file path if the end of the 
+  path was not the same as the Symbol.  That meant that getSymbols.FI could not
+  be used to get data for a Symbol that was the same as the base directory.
+  getSymbols.FI now always appends the Symbol to the file path and 
+  setSymbolLookup.FI does not append it to the base_dir. Test added.
 
 TESTS
 -----

Modified: pkg/FinancialInstrument/R/load.instruments.R
===================================================================
--- pkg/FinancialInstrument/R/load.instruments.R	2013-02-02 21:54:49 UTC (rev 1388)
+++ pkg/FinancialInstrument/R/load.instruments.R	2013-02-05 01:14:43 UTC (rev 1389)
@@ -202,7 +202,7 @@
         symbol<-list()
         symbol[[1]]<-params
         # construct $dir
-        symbol[[1]]$dir<-paste(base_dir,instr_str,sep=sepch)
+        symbol[[1]]$dir<-base_dir
         names(symbol)[1]<-instr
         new.symbols<-c(new.symbols,symbol)
     }