From 087942750277b634d9af763e4ed0e3c249dd26eb Mon Sep 17 00:00:00 2001
From: Martijn Vermaat <martijn@vermaat.name>
Date: Tue, 14 Jan 2014 14:15:45 +0100
Subject: [PATCH] Rename batch job types (e.g., NameChecker -> name-checker)
---
mutalyzer/Scheduler.py | 8 ++++----
mutalyzer/db/models.py | 6 ++++--
mutalyzer/services/rpc.py | 8 +++++---
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/mutalyzer/Scheduler.py b/mutalyzer/Scheduler.py
index 77e7f311..1547780a 100644
--- a/mutalyzer/Scheduler.py
+++ b/mutalyzer/Scheduler.py
@@ -358,13 +358,13 @@ Mutalyzer batch scheduler""" % url)
if batch_queue_item is not None:
item, flags = batch_queue_item
- if batch_job.job_type == 'NameChecker':
+ if batch_job.job_type == 'name-checker':
self._processNameBatch(batch_job, item, flags)
- elif batch_job.job_type == 'SyntaxChecker':
+ elif batch_job.job_type == 'syntax-checker':
self._processSyntaxCheck(batch_job, item, flags)
- elif batch_job.job_type == 'PositionConverter':
+ elif batch_job.job_type == 'position-converter':
self._processConversion(batch_job, item, flags)
- elif batch_job.job_type == 'SnpConverter':
+ elif batch_job.job_type == 'snp-converter':
self._processSNP(batch_job, item, flags)
else:
# Unknown job type, should never happen.
diff --git a/mutalyzer/db/models.py b/mutalyzer/db/models.py
index 654fba73..81493251 100644
--- a/mutalyzer/db/models.py
+++ b/mutalyzer/db/models.py
@@ -15,8 +15,10 @@ from sqlalchemy.orm import backref, relationship
from mutalyzer import db
-BATCH_JOB_TYPES = ('NameChecker', 'SyntaxChecker', 'PositionConverter',
- 'SnpConverter')
+BATCH_JOB_TYPES = ('name-checker',
+ 'syntax-checker',
+ 'position-converter',
+ 'snp-converter')
@event.listens_for(Engine, 'connect')
diff --git a/mutalyzer/services/rpc.py b/mutalyzer/services/rpc.py
index ced3405e..a8fe4c1a 100644
--- a/mutalyzer/services/rpc.py
+++ b/mutalyzer/services/rpc.py
@@ -78,8 +78,10 @@ class MutalyzerService(ServiceBase):
scheduler = Scheduler.Scheduler()
file_instance = File.File(output)
- batch_types = ['NameChecker', 'SyntaxChecker', 'PositionConverter',
- 'SnpConverter']
+ batch_types = {'NameChecker': 'name-checker',
+ 'SyntaxChecker': 'syntax-checker',
+ 'PositionConverter': 'position-converter',
+ 'SnpConverter': 'snp-converter'}
if process not in batch_types:
raise Fault('EARG',
@@ -118,7 +120,7 @@ class MutalyzerService(ServiceBase):
raise Fault('EPARSE', 'Could not parse input file, please check your file format.')
result_id = scheduler.addJob('job@webservice', job, columns,
- 'webservice', process, argument)
+ 'webservice', batch_types[process], argument)
return result_id
@srpc(Mandatory.String, _returns=Integer)
--
GitLab