Mercurial > repos > cathywise > truststore_import
changeset 31:6e2dba73eebd
Undo multi file ugh.
| author | Catherine Wise <catherine.wise@csiro.au> |
|---|---|
| date | Thu, 23 Jan 2014 10:48:07 +1100 |
| parents | c659bd6342ae |
| children | 1299e901a0ea |
| files | TrustStoreGalaxyImport.py TrustStoreGalaxyImport.xml |
| diffstat | 2 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/TrustStoreGalaxyImport.py Thu Jan 23 10:36:03 2014 +1100 +++ b/TrustStoreGalaxyImport.py Thu Jan 23 10:48:07 2014 +1100 @@ -63,9 +63,9 @@ if len(sys.argv) > 10: filename = sys.argv[9] outputFile = sys.argv[10] - outputFileId = sys.argv[11] - outputFileType = sys.argv[12] - otherFilesDir = sys.argv[13] + # outputFileId = sys.argv[11] + # outputFileType = sys.argv[12] + # otherFilesDir = sys.argv[13] else: outputFile = sys.argv[9] @@ -94,13 +94,13 @@ if filename and filename != "": outputFileList = [outputFile] inputFileList = None - if "," in filename: # we have multiple files guys. - inputFileList = filename.split(",") - for inputFile in inputFileList: - outName = "%s_%s_%s_%s_%s" % ('primary', outputFileId, inputFile.replace(".","-"), 'visible', outputFileType) - outputFileList.append(os.path.join(otherFilesDir, outName)) - else: - inputFileList = [filename] + # if "," in filename: # we have multiple files guys. + # inputFileList = filename.split(",") + # for inputFile in inputFileList: + # outName = "%s_%s_%s_%s_%s" % ('primary', outputFileId, inputFile.replace(".","-"), 'visible', outputFileType) + # outputFileList.append(os.path.join(otherFilesDir, outName)) + # else: + inputFileList = [filename] for inFile, outFile in zip(inputFileList, outputFileList): downloadMe = ts_utils.ts_utils.recurseToChildNamed(location, inFile) if downloadMe:
--- a/TrustStoreGalaxyImport.xml Thu Jan 23 10:36:03 2014 +1100 +++ b/TrustStoreGalaxyImport.xml Thu Jan 23 10:48:07 2014 +1100 @@ -6,7 +6,7 @@ <exit_code range="4" err_level="fatal" description="Could not find supplied filename in store at path." /> <exit_code range="5" err_level="fatal" description="Bad credentials supplied. See stdout for more information." /> </stdio> - <command interpreter="python">TrustStoreGalaxyImport.py https://tstest-kms.it.csiro.au/kmscolab_3_0 https://tstest-ims.it.csiro.au/ims_3_0/services/IMS $username $password desktop cpU92F1PT7VOCANjSknuCDp4DrubmujoBaF6b0miz8OpKNokEbGMHCaSFK5/lISbBmaaGVCgeADI2A39F3Hkeg== $storename $path $filename $output1 $output1.id $file_type $__new_file_path__</command> + <command interpreter="python">TrustStoreGalaxyImport.py https://tstest-kms.it.csiro.au/kmscolab_3_0 https://tstest-ims.it.csiro.au/ims_3_0/services/IMS $username $password desktop cpU92F1PT7VOCANjSknuCDp4DrubmujoBaF6b0miz8OpKNokEbGMHCaSFK5/lISbBmaaGVCgeADI2A39F3Hkeg== $storename $path $filename $output1 </command> <!-- $output1.id $file_type </command> $__new_file_path__</command> --> <inputs> <param name="file_type" type="select" label="File Format" help="Which format is the data you're downloading?"> <option value="just list files"/>