Mercurial > repos > matt-shirley > json_data_source
comparison json_data_source.py @ 7:ac7b4cab83cd default tip
Fix syntax.
| author | Matt Shirley <mdshw5@gmail.com> |
|---|---|
| date | Wed, 27 Aug 2014 09:34:17 -0400 |
| parents | 46b589e9747a |
| children |
comparison
equal
deleted
inserted
replaced
| 6:46b589e9747a | 7:ac7b4cab83cd |
|---|---|
| 96 filename = ''.join( c in VALID_CHARS and c or '-' for c in filename ) | 96 filename = ''.join( c in VALID_CHARS and c or '-' for c in filename ) |
| 97 name = construct_multi_filename( hda_id, filename, extension ) | 97 name = construct_multi_filename( hda_id, filename, extension ) |
| 98 target_output_filename = os.path.normpath( '/'.join( [ output_base_path, name ] ) ) | 98 target_output_filename = os.path.normpath( '/'.join( [ output_base_path, name ] ) ) |
| 99 metadata_parameter_file.write( metadata_to_json( dataset_id, query_item, | 99 metadata_parameter_file.write( metadata_to_json( dataset_id, query_item, |
| 100 target_output_filename, | 100 target_output_filename, |
| 101 ds_type='new_primary_dataset' | 101 ds_type='new_primary_dataset', |
| 102 primary=primary) ) | 102 primary=primary) ) |
| 103 else: | 103 else: |
| 104 target_output_filename = output_filename | 104 target_output_filename = output_filename |
| 105 metadata_parameter_file.write( metadata_to_json( dataset_id, query_item, | 105 metadata_parameter_file.write( metadata_to_json( dataset_id, query_item, |
| 106 target_output_filename, | 106 target_output_filename, |
| 107 ds_type='dataset' | 107 ds_type='dataset', |
| 108 primary=primary) ) | 108 primary=primary) ) |
| 109 download_from_query( query_item, target_output_filename ) | 109 download_from_query( query_item, target_output_filename ) |
| 110 if extra_data: | 110 if extra_data: |
| 111 extra_files_path = ''.join( [ target_output_filename, 'files' ] ) | 111 extra_files_path = ''.join( [ target_output_filename, 'files' ] ) |
| 112 download_extra_data( extra_data, extra_files_path ) | 112 download_extra_data( extra_data, extra_files_path ) |