Implement review fix

nfdi4plants · Oct 21, 2024 · cb87cba · cb87cba
1 parent a0eeeed
commit cb87cba
Showing 1 changed file with 7 additions and 11 deletions.
diff --git 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