From 2195ace01b8a0470051706081487fa0d9c992235 Mon Sep 17 00:00:00 2001
From: Martijn Vermaat <martijn@vermaat.name>
Date: Mon, 14 Jan 2013 09:22:00 +0000
Subject: [PATCH] Accept trailing tabs in batch input
git-svn-id: https://humgenprojects.lumc.nl/svn/mutalyzer/trunk@663 eb6bd6ab-9ccd-42b9-aceb-e2899b4a52f1
---
mutalyzer/File.py | 2 +-
mutalyzer/website.py | 4 ++++
tests/test_website.py | 11 +++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/mutalyzer/File.py b/mutalyzer/File.py
index 95aa98ae..0261999e 100644
--- a/mutalyzer/File.py
+++ b/mutalyzer/File.py
@@ -355,7 +355,7 @@ class File() :
ret.append("~!InputFields: " + '|'.join(job))
ret.extend(['~!' for _ in range(columns - 1)])
else:
- ret.extend(job)
+ ret.extend([j or '~!' for j in job])
#else
if not ret:
diff --git a/mutalyzer/website.py b/mutalyzer/website.py
index 5d894a96..2381b5ab 100644
--- a/mutalyzer/website.py
+++ b/mutalyzer/website.py
@@ -1069,6 +1069,10 @@ class BatchProgress:
D = Db.Batch()
left = D.entriesLeftForJob(jobID)
percentage = int(100 - (100 * left / float(total)))
+ if percentage < 0:
+ percentage = 0
+ elif percentage > 100:
+ percentage = 100
if i.ajax:
if percentage == 100:
#download url, check if file still exists
diff --git a/tests/test_website.py b/tests/test_website.py
index 31af66f2..b2a87d4f 100644
--- a/tests/test_website.py
+++ b/tests/test_website.py
@@ -430,6 +430,17 @@ class TestWSGI():
size=len(variants),
header='Input\tErrors | Messages')
+ def test_batch_namechecker_extra_tab(self):
+ """
+ Submit the batch name checker form with lines ending with tab
+ characters.
+ """
+ variants=['AB026906.1(SDHD):g.7872G>T\t']
+ self._batch('NameChecker',
+ file='\n'.join(variants),
+ size=len(variants),
+ header='Input\tErrors | Messages')
+
def test_batch_syntaxchecker(self):
"""
Submit the batch syntax checker form.
--
GitLab