initial attempt to use django restframework

[htsworkflow.git] / htsworkflow / urls.py

diff --git a/htsworkflow/urls.py b/htsworkflow/urls.py
index bb8364280e69f5ad649b41081b613a62c4389263..1f258ebffdfaa3b232fce2d00de55862018d24b1 100644 (file)
--- a/htsworkflow/urls.py
+++ b/htsworkflow/urls.py
@@ -3,29 +3,32 @@ from django.contrib import admin
 import django
 admin.autodiscover()
 
-from django.conf import settings
+from experiments.urls import urlpatterns as experiment_urls
 
-urlpatterns = patterns('',
+urlpatterns = experiment_urls
+
+urlpatterns += patterns(
+    '',
     url('^accounts/', include('django.contrib.auth.urls')),
     # Base:
     url(r'^eland_config/', include('eland_config.urls')),
     # Experiments:
-    url(r'^experiments/', include('experiments.urls')),
-    url(r'^lane/(?P<lane_pk>\w+)',
-        'experiments.views.flowcell_lane_detail'),
-    url(r'^flowcell/(?P<flowcell_id>\w+)/((?P<lane_number>\w+)/)?$',
-        'experiments.views.flowcell_detail'),
+    # url(r'^experiments/', include('experiments.urls')),
+    # url(r'^lane/(?P<lane_pk>\w+)',
+    #    'experiments.views.flowcell_lane_detail'),
+    # url(r'^flowcell/(?P<flowcell_id>\w+)/((?P<lane_number>\w+)/)?$',
+    #    'experiments.views.flowcell_detail'),
     url(r'^inventory/', include('inventory.urls')),
     url(r'^library/', include('samples.urls')),
-    url(r'^lanes_for/$', 'experiments.views.lanes_for'),
-    url(r'^lanes_for/(?P<username>[-_ \w]+)', 'experiments.views.lanes_for'),
-    ### library id to admin url
-    url(r'^library_id_to_admin_url/(?P<lib_id>\w+)/$',
-        'samples.views.library_id_to_admin_url'),
-    ### sample / library information
+    # url(r'^lanes_for/$', 'experiments.views.lanes_for'),
+    # url(r'^lanes_for/(?P<username>[-_ \w]+)', 'experiments.views.lanes_for'),
+    # library id to admin url
+    # url(r'^library_id_to_admin_url/(?P<lib_id>\w+)/$',
+    #     'samples.views.library_id_to_admin_url'),
+    # sample / library information
     url(r'^samples/', include('samples.urls')),
-    url(r'^sequencer/(?P<sequencer_id>\w+)',
-        'experiments.views.sequencer'),
+    # url(r'^sequencer/(?P<sequencer_id>\w+)',
+    #    'experiments.views.sequencer'),
 
     url(r'^admin/', include(admin.site.urls)),
 )