Skip to content

added a function that grabs the titles of the sheet tabs and checks if SWC is missing, gives better error message #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

added a function that grabs the titles of the sheet tabs and checks if SWC is missing, gives better error message #235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions ingest/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2525,10 +2525,10 @@ def descriptive_metadata_upload(request):
associated_collection = form.cleaned_data['associated_collection']

# for production
datapath = associated_collection.data_path.replace("/lz/","/etc/")
#datapath = associated_collection.data_path.replace("/lz/","/etc/")

# for development on vm
#datapath = '/Users/luketuite/shared_bil_dev'
datapath = '/Users/luketuite/shared_bil_dev'

# for development locally
# datapath = '/Users/ecp/Desktop/bil_metadata_uploads'
Expand All @@ -2553,6 +2553,11 @@ def descriptive_metadata_upload(request):
# using new metadata model
elif version1 == False:
errormsg = check_all_sheets(filename, ingest_method)

if 'SWC' not in get_sheet_names(filename):
messages.error(request, 'Error: The uploaded spreadsheet is missing the required SWC tab. Your template is likely out of date, please download the latest version of the template.')
return redirect('ingest:descriptive_metadata_upload')

if errormsg != '':
messages.error(request, errormsg)
return redirect('ingest:descriptive_metadata_upload')
Expand Down Expand Up @@ -2621,6 +2626,16 @@ def descriptive_metadata_upload(request):

return render( request, 'ingest/descriptive_metadata_upload.html',{'form': form, 'pi':pi, 'collections':collections})

def get_sheet_names(file_path):
try:
workbook = xlrd.open_workbook(file_path)
sheet_names = workbook.sheet_names()
return sheet_names
except Exception as e:
# Handle the exception (e.g., file not found, invalid Excel file, etc.)
print(f"Error while getting sheet names: {e}")
return []

def upload_descriptive_spreadsheet(filename, associated_collection, request):
""" Helper used by image_metadata_upload and collection_detail."""
workbook=xlrd.open_workbook(filename)
Expand Down