move aggregation check into correct block
@@ -112,6 +112,8 @@ def download(request, path, rest_call=False, use_async=True, use_reverse_proxy=T
irods_output_path = irods_path
+ # folder requests are automatically zipped
+ if not is_bag_download and not is_zip_download: # path points into resource: should I zip it?
# check for aggregations
if is_aggregation_request and res.resource_type == "CompositeResource":
try:
@@ -138,8 +140,6 @@ def download(request, path, rest_call=False, use_async=True, use_reverse_proxy=T
irods_path = path
irods_output_path = output_path
- # folder requests are automatically zipped
- if not is_bag_download and not is_zip_download: # path points into resource: should I zip it?
store_path = u'/'.join(split_path_strs[1:]) # data/contents/{path-to-something}
if res.is_folder(store_path): # automatically zip folders
is_zip_request = True
