Managed to use a urllib python 2.6 feature... converting code to work in 2.5

[htsworkflow.git] / scripts / mark_archived_data

diff --git a/scripts/mark_archived_data b/scripts/mark_archived_data
index 80c6792af9e26b8818cec9e734201049a26d5e60..62eca10304a0b52afa4322ca7d679dcef6041d42 100755 (executable)
--- a/scripts/mark_archived_data
+++ b/scripts/mark_archived_data
@@ -11,6 +11,8 @@ from optparse import OptionParser
 
 import sys
 import urllib
+import urllib2
+
 
 
 def construct_parser():
@@ -23,22 +25,28 @@ def construct_parser():
                       help="device flowcell is being archived to")
     parser.add_option("-s", "--serial", action="store", type="string", dest="serial",
                       help="serial num. of archive device")
+    parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False)
     
     return parser
 
 
-def update_db(flowcell, serial):
+def update_db(flowcell, serial, debug=False):
     """
     Creates link between flowcell and storage device over http
     """
-    www = urllib.urlopen(settings.LINK_FLOWCELL_STORAGE_DEVICE_URL+'%s/%s/' % (flowcell, serial))
-    httpcode = www.getcode()
-    if httpcode != 200:
-        print 'ERROR - HTTP OUTPUT:'
-        print www.read()
-        sys.exit(httpcode)
+    url = settings.LINK_FLOWCELL_STORAGE_DEVICE_URL+'%s/%s/' % (flowcell, serial)
+    
+    req = urllib2.Request(url)
+    try:
+        response = urllib2.urlopen(req)
+    except urllib2.URLError, e:
+        print 'ERROR - HTTP OUTPUT (Return Code: %s); use -v/--verbose for more details.' % (e.code)
+        if debug:
+            print e.read()
+        sys.exit(e.code)
     
     print "DB Update of %s & %s succeeded" % (flowcell, serial)
+    print response.read()
 
 
 def process_args(parser):
@@ -55,9 +63,9 @@ def process_args(parser):
               "  The serial number is extracted automatically if the device is provided."
         sys.exit(2)
     
-    print options.flowcell
-    print options.device
-    print options.serial
+    print 'Flowcell:', options.flowcell
+    print '  Device:', options.device
+    print '  Serial:', options.serial
     
     if options.flowcell is None:
         msg.append("  --flowcell required")
@@ -73,9 +81,9 @@ def process_args(parser):
     # Update db records
     if options.device is not None:
         serial = get_hd_serial_num(options.device)
-        update_db(flowcell=options.flowcell, serial=serial)
+        update_db(flowcell=options.flowcell, serial=serial, debug=options.verbose)
     elif options.serial is not None:
-        update_db(flowcell=options.flowcell, serial=options.serial)
+        update_db(flowcell=options.flowcell, serial=options.serial, debug=options.verbose)
     else:
         msg ="FATAL should not happen error occured; i.e. the best kind!"
         raise ValueError, msg