Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
tcezard committed Jun 30, 2023
1 parent 4835d88 commit c8d23c9
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions eva_submission/eload_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,10 @@ def check_accessioning_was_done(self, analysis, filenames):
"""
accessioning_reports = self.get_accession_reports_for_study()
accessioned_filenames = [self.get_accession_file(f) for f in filenames]
if not accessioning_reports:
return []
if len(accessioning_reports) == 1:
# Only one accessioning report
accessioning_report = accessioning_reports[0]
elif len([r for r in accessioning_reports if r in accessioned_filenames]) == 1:
elif len([r for r in accessioning_reports if os.path.basename(r) in accessioned_filenames]) == 1:
# Only one accessioning report name present in the database for this analysis
accessioning_report = [r for r in accessioning_reports if os.path.basename(r) in accessioned_filenames][0]
elif len([r for r in accessioning_reports if analysis in r]) == 1:
Expand All @@ -265,8 +263,6 @@ def check_accessioning_was_done(self, analysis, filenames):
# No reports
self.error(f'Cannot assign accessioning report to project {self.project} analysis {analysis} '
f'for files {accessioning_reports}')
accessioning_report = None
if not accessioning_report:
return []
return self.get_accessioning_info_from_file(accessioning_report)

Expand Down

0 comments on commit c8d23c9

Please sign in to comment.