# HG changeset patch # User trinity_ctat # Date 1525181897 14400 # Node ID cdd963ca4bbb45f22a52a5ee7030ba3380d5a008 # Parent bf41e354f3594e37532843c7d3bbd5c2be39d1b8 Uploaded diff -r bf41e354f359 -r cdd963ca4bbb data_manager/add_ctat_centrifuge_index.py --- a/data_manager/add_ctat_centrifuge_index.py Tue May 01 09:31:18 2018 -0400 +++ b/data_manager/add_ctat_centrifuge_index.py Tue May 01 09:38:17 2018 -0400 @@ -79,20 +79,20 @@ # ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/p_compressed+h+v.tar.gz # ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/p+h+v.tar.gz # Which could be hard coded: - # vals.append(("p_compressed+h+v", "ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/p_compressed+h+v.tar.gz", True)) - # vals.append(("p+h+v", "ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/p+h+v.tar.gz", False)) - # vals.append(("nt_2018_3_3", "ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/nt_2018_3_3.tar.gz", False)) - # vals.append(("p_compressed_2018_4_15", "ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/p_compressed_2018_4_15.tar.gz", False)) + # options.append(("p_compressed+h+v", "ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/p_compressed+h+v.tar.gz", True)) + # options.append(("p+h+v", "ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/p+h+v.tar.gz", False)) + # options.append(("nt_2018_3_3", "ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/nt_2018_3_3.tar.gz", False)) + # options.append(("p_compressed_2018_4_15", "ftp://ftp.ccb.jhu.edu/pub/infphilo/centrifuge/data/p_compressed_2018_4_15.tar.gz", False)) # but only returning the one we want, which for now is assumed to be present. # For now, I am printing the list, just so I can see what was returned, print "FYI: The URL's that were found on Centrifuge's page are:" print "\t" + "\n\t".join(filelist_parser.filenames) # For now instead of sending back the list of found URL's, send back the one URL we want. # Currently, only one of the options is supported. - vals.append((_CTAT_CentrifugeDir_Name, _CTAT_CentrifugeDownload_URL, True)) + options.append((_CTAT_CentrifugeDir_Name, _CTAT_CentrifugeDownload_URL, True)) print "The items in vals are:" - print str(vals) - return vals + print str(options) + return options # The following was used by the example program to get input parameters through the json. # Just leaving here for reference.