From 4ff25f31e492c145f92bd20d6c7f8dd503a261f8 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Tue, 15 Mar 2011 15:28:40 +0000
Subject: [PATCH] fix for blast+ output
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@15725 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/MSPcrunchComparisonData.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/uk/ac/sanger/artemis/MSPcrunchComparisonData.java b/uk/ac/sanger/artemis/MSPcrunchComparisonData.java
index 7a8adafc7..eefebd069 100644
--- a/uk/ac/sanger/artemis/MSPcrunchComparisonData.java
+++ b/uk/ac/sanger/artemis/MSPcrunchComparisonData.java
@@ -27,7 +27,8 @@ package uk.ac.sanger.artemis;
import uk.ac.sanger.artemis.util.LinePushBackReader;
-import java.io.*;
+import java.io.IOException;
+import java.io.Writer;
import java.util.StringTokenizer;
/**
@@ -86,7 +87,12 @@ public class MSPcrunchComparisonData extends SimpleComparisonData
final String s_end_token = tokenizer.nextToken ();
try {
- final int score = Integer.valueOf (score_token).intValue ();
+ int score;
+ try {
+ score = Integer.valueOf (score_token).intValue ();
+ } catch (NumberFormatException e) {
+ score = Float.valueOf (score_token).intValue (); // blast+
+ }
final int percent_ident =
(int)(Float.valueOf (percent_ident_token).floatValue ());
final int q_start = Integer.valueOf (q_start_token).intValue ();
--
GitLab