From cb87cbae068291812dabb43f7e0926ab7eb19973 Mon Sep 17 00:00:00 2001 From: patrick blume Date: Mon, 21 Oct 2024 13:09:13 +0200 Subject: [PATCH] Implement review fix --- src/Spreadsheet/Template.fs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/Spreadsheet/Template.fs b/src/Spreadsheet/Template.fs index f271e708..acc70263 100644 --- a/src/Spreadsheet/Template.fs +++ b/src/Spreadsheet/Template.fs @@ -271,19 +271,15 @@ module Template = /// Reads an assay from a spreadsheet let fromFsWorkbook (doc : FsWorkbook) = - // Reading the "Assay" metadata sheet. Here metadata - let templateInfo, ers, tags, authors = - - match doc.TryGetWorksheetByName metaDataSheetName with + // Reading the "Template" metadata sheet. Here metadata + let templateInfo, ers, tags, authors = + match tryGetMetadataSheet doc with | Option.Some sheet -> fromMetadataSheet sheet - | None -> - match doc.TryGetWorksheetByName obsoletemetaDataSheetName with - | Option.Some sheet -> - fromMetadataSheet sheet - | None -> - Metadata.Template.TemplateInfo.empty, [], [], [] - + | None -> + printfn "Could not find metadata sheet with sheetname \"isa_template\" or deprecated sheetname \"Template\"" + Metadata.Template.TemplateInfo.empty, [], [], [] + let tryTableNameMatches (ws : FsWorksheet) = if ws.Tables |> Seq.exists (fun t -> t.Name = templateInfo.Table) then Some ws else None