From daf2f7b705f7c811830fd8c646855b2ac5f9d2f2 Mon Sep 17 00:00:00 2001 From: Brandon King Date: Wed, 2 Jan 2008 22:42:14 +0000 Subject: [PATCH] Updated regexs to support new and "improved" flow cell numbers! (ticket:2) * Thank heavens for regex! * URL for valid flow cell number is any alphanumeric character now rather than FC#####. * Getting the flowcell number from the directory path should now work again. --- gaworkflow/frontend/eland_config/urls.py | 2 +- gaworkflow/runner.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gaworkflow/frontend/eland_config/urls.py b/gaworkflow/frontend/eland_config/urls.py index c5292ab..1c6a298 100644 --- a/gaworkflow/frontend/eland_config/urls.py +++ b/gaworkflow/frontend/eland_config/urls.py @@ -3,7 +3,7 @@ from django.conf.urls.defaults import * urlpatterns = patterns('', # Example: - (r'^(?PFC\d+)/$', 'gaworkflow.frontend.eland_config.views.config'), + (r'^(?P[0-9a-zA-Z]+)/$', 'gaworkflow.frontend.eland_config.views.config'), (r'^$', 'gaworkflow.frontend.eland_config.views.config'), #(r'^$', 'gaworkflow.frontend.eland_config.views.index') diff --git a/gaworkflow/runner.py b/gaworkflow/runner.py index 5eb625b..a465046 100644 --- a/gaworkflow/runner.py +++ b/gaworkflow/runner.py @@ -11,7 +11,8 @@ from benderjab import rpc from gaworkflow.pipeline.configure_run import * from gaworkflow.pipeline.monitors import startCmdLineStatusMonitor -s_fc = re.compile('FC[0-9]+') +#s_fc = re.compile('FC[0-9]+') +s_fc = re.compile('_[0-9a-zA-Z]*$') def _get_flowcell_from_rundir(run_dir): @@ -25,7 +26,7 @@ def _get_flowcell_from_rundir(run_dir): logging.error('RunDir 2 FlowCell error: %s' % (run_dir)) return None - return dirname[mo.start():] + return dirname[mo.start()+1:] -- 2.30.2