Changeset 3412 for trunk/yat/omic/BamHeader.cc

Timestamp:

Apr 23, 2015, 1:00:30 AM (8 years ago)

Author:

Peter

Message:

throw exception rather than returnining empty string when ID or KEY is missing in header. refs #817

File:

• trunk/yat/omic/BamHeader.cc (modified) (2 diffs)

trunk/yat/omic/BamHeader.cc

@@ -26 +26 @@
 #include "yat/utility/Exception.h"
 #include "yat/utility/split.h"
+#include "yat/utility/stl_utility.h"
 
 // we need to include 'sam_header.h' when compiling against libbam
@@ -99 +100 @@
         }
       }
-      if (table.empty())
-        table[""][""]; // to avoid re-parsing
-    }
-    return table[id][key];
+    }
+    strMap2::const_iterator line_table = table.find(id);
+    if (line_table == table.end()) {
+      std::string msg = "@" + type + ": unknown ID: '" + id + "'";
+      throw utility::runtime_error(msg);
+    }
+    strMap::const_iterator it = line_table->second.find(key);
+    if (it == line_table->second.end()) {
+      std::string msg = "@" + type + ": unknown KEY: '" + key + "'";
+      throw utility::runtime_error(msg);
+    }
+    return it->second;
   }