Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4

[htsworkflow.git] / encode_submission / trackhub.py

diff --git a/encode_submission/trackhub.py b/encode_submission/trackhub.py
index 4fea5cc827eca6ef7aa08c39642e6bd4aa1dac0b..fb0cea8771dcbc25b11dc95654e1e12ed62d2eb9 100644 (file)
--- a/encode_submission/trackhub.py
+++ b/encode_submission/trackhub.py
@@ -96,7 +96,7 @@ def main(cmdline=None):
         mapper.scan_submission_dirs(results)
 
     if opts.make_hub:
-        mapper.make_hub(results)
+        make_hub(results)
 
     if opts.sparql:
         sparql_query(model, opts.sparql)
@@ -106,6 +106,18 @@ def main(cmdline=None):
         print writer.serialize_model_to_string(model)
 
 
+def make_hub(results):
+    trackdb = mapper.make_hub(results)
+    manifest = mapper.make_manifest(results)
+
+    trackstream = sys.stdout
+    #with open('trackDb.txt', 'w') as trackstream:
+    trackstream.write(trackdb)
+
+    #with open('manifest.txt', 'w') as mainifeststream:
+    manifeststream = sys.stdout
+    mainifeststream.write(mainifest)
+        
 def make_parser():
     parser = OptionParser()