Changeset 2983

Timestamp:

Feb 4, 2013, 2:10:14 PM (9 years ago)

Author:

Peter

Message:

fixes #751. throw if OutBamFile::write fails

Location:

trunk

Files:

• test/bam_iterator.cc (modified) (2 diffs)
• yat/omic/BamFile.cc (modified) (2 diffs)
• yat/omic/BamFile.h (modified) (2 diffs)

trunk/test/bam_iterator.cc

@@ -1 +1 @@
 // $Id$
 //
-// Copyright (C) 2012 Peter Johansson
+// Copyright (C) 2012, 2013 Peter Johansson
 //
 // This program is free software; you can redistribute it and/or modify
@@ -47 +47 @@
   return EXIT_SKIP;
 #endif
-  test1(suite);
+  try {
+    test1(suite);
+  }
+  catch (std::runtime_error& e) {
+    suite.add(false);
+    suite.err() << "error: what: " << e.what() << "\n";
+  }
   return suite.return_value();
 }

trunk/yat/omic/BamFile.cc

@@ -1 +1 @@
 // $Id$
 //
-// Copyright (C) 2012 Peter Johansson
+// Copyright (C) 2012, 2013 Peter Johansson
 //
 // This program is free software; you can redistribute it and/or modify
@@ -131 +131 @@
   void OutBamFile::write(const BamRead& read)
   {
-    samwrite(sf_, read.bam_);
+    if (!samwrite(sf_, read.bam_)) {
+      // FIXME if wanted perhaps we should throw an OutBamFile::error
+      // instead that can hold \a read
+      throw utility::runtime_error("OutBamFile::write failed");
+    }
   }
 

trunk/yat/omic/BamFile.h

@@ -4 +4 @@
 // $Id$
 //
-// Copyright (C) 2012 Peter Johansson
+// Copyright (C) 2012, 2013 Peter Johansson
 //
 // This program is free software; you can redistribute it and/or modify
@@ -199 +199 @@
     /**
        \brief write a read to output file
+
+       \throw utility::runtime_error if write failed
      */
     void write(const BamRead& read);