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

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

Author: gsee
Date: 2011-09-27 20:51:50 +0200 (Tue, 27 Sep 2011)
New Revision: 802

Modified:
   pkg/FinancialInstrument/DESCRIPTION
   pkg/FinancialInstrument/R/instrument.R
Log:
 better identifiers matching in getInstrument

Modified: pkg/FinancialInstrument/DESCRIPTION
===================================================================
--- pkg/FinancialInstrument/DESCRIPTION	2011-09-27 15:47:19 UTC (rev 801)
+++ pkg/FinancialInstrument/DESCRIPTION	2011-09-27 18:51:50 UTC (rev 802)
@@ -11,7 +11,7 @@
     meta-data and relationships. Provides support for
     multi-asset class and multi-currency portfolios.  
     Still in heavy development.
-Version: 0.7
+Version: 0.7.1
 URL: https://r-forge.r-project.org/projects/blotter/
 Date: $Date$
 Depends:

Modified: pkg/FinancialInstrument/R/instrument.R
===================================================================
--- pkg/FinancialInstrument/R/instrument.R	2011-09-27 15:47:19 UTC (rev 801)
+++ pkg/FinancialInstrument/R/instrument.R	2011-09-27 18:51:50 UTC (rev 802)
@@ -822,7 +822,7 @@
         instr_list<-ls(pos=.instrument)
         for (instr in instr_list){
             tmp_instr<-try(get(instr,pos=.instrument),silent=TRUE)
-            if(inherits(tmp_instr, type) && any(x == tmp_instr$identifiers)) {
+            if(inherits(tmp_instr, type) && !is.na(suppressWarnings(match(x, tmp_instr$identifiers)))) {
                 return(tmp_instr)
             }
         }