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.

diff --git a/gaworkflow/frontend/eland_config/urls.py b/gaworkflow/frontend/eland_config/urls.py
index c5292ab49e6245940bad741127a33db43c809101..1c6a298dc4e759a69833387eaf054fac7f0a631c 100644 (file)
--- 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'^(?P<flowcell>FC\d+)/$', 'gaworkflow.frontend.eland_config.views.config'),
+    (r'^(?P<flowcell>[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 5eb625b863933b4dd5ffa43f1c934211b0126eb1..a46504617f70bccee5c611aae33b76d2744db47d 100644 (file)
--- 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:]