Moved hardcoded URL to it's proper place in the settings.py.

  * Supports Diane's config file feature. =o)

diff --git a/htsworkflow/frontend/settings.py b/htsworkflow/frontend/settings.py
index 9986f7959ed7e99728817a4cf600aecb268c9dc1..d971bbcbe004fe97ce839fa7d0a85089cd7deee0 100644 (file)
--- a/htsworkflow/frontend/settings.py
+++ b/htsworkflow/frontend/settings.py
@@ -54,7 +54,8 @@ options = ConfigParser.SafeConfigParser(
              'database_name': 
                os.path.abspath('/htsworkflow/htswfrontend/dev_fctracker.db'),
              'time_zone': 'America/Los_Angeles',
-             'default_pm': '5'
+             'default_pm': '5',
+             'link_flowcell_storage_device_url': "http://localhost:8000/inventory/lts/link/"
            })
 
 options.read([os.path.expanduser("~/.htsworkflow.ini"),
@@ -169,3 +170,6 @@ options_to_dict(ALLOWED_ANALYS_IPS, 'allowed_analysis_hosts')
 #UPLOADTO_ELAND_RESULT_PACKS = os.path.join(UPLOADTO_HOME, 'eland_results')
 #UPLOADTO_BED_PACKS = os.path.join(UPLOADTO_HOME, 'bed_packs')
 RESULT_HOME_DIR='/Users/diane/proj/solexa/results/flowcells'
+
+LINK_FLOWCELL_STORAGE_DEVICE_URL = options.get('frontend', 'link_flowcell_storage_device_url')
+

diff --git a/scripts/mark_archived_data b/scripts/mark_archived_data
index e760318f3d8799a603e8ea53940906173e79e0cb..80c6792af9e26b8818cec9e734201049a26d5e60 100755 (executable)
--- a/scripts/mark_archived_data
+++ b/scripts/mark_archived_data
@@ -4,6 +4,7 @@
 #os.environ['DJANGO_SETTINGS_MODULE'] = 'htsworkflow.frontend.settings'
 
 from htsworkflow.util.hdquery import get_hd_serial_num
+from htsworkflow.frontend import settings
 
 #from django.conf import settings
 from optparse import OptionParser
@@ -11,8 +12,6 @@ from optparse import OptionParser
 import sys
 import urllib
 
-#FIXME: Remove hard coded URL
-HTSW_URL = "http://localhost:8000/inventory/lts/link/"
 
 def construct_parser():
     """
@@ -32,7 +31,7 @@ def update_db(flowcell, serial):
     """
     Creates link between flowcell and storage device over http
     """
-    www = urllib.urlopen(HTSW_URL+'%s/%s/' % (flowcell, serial))
+    www = urllib.urlopen(settings.LINK_FLOWCELL_STORAGE_DEVICE_URL+'%s/%s/' % (flowcell, serial))
     httpcode = www.getcode()
     if httpcode != 200:
         print 'ERROR - HTTP OUTPUT:'