@@ -109,23 +109,25 @@ module MetaData =
109109
110110 /// Try get assay from metadatasheet with given sheetName
111111 let tryGetAssay sheetName ( doc : SpreadsheetDocument ) =
112+ let sst = Spreadsheet.tryGetSharedStringTable doc
112113 match Spreadsheet.tryGetSheetBySheetName sheetName doc with
113114 | Some sheet ->
114115 sheet
115116 |> SheetData.getRows
116- |> Seq.map ( Row.getIndexedValues None >> Seq.map ( fun ( i , v ) -> ( int i) - 1 , v))
117+ |> Seq.map ( Row.getIndexedValues sst >> Seq.map ( fun ( i , v ) -> ( int i) - 1 , v))
117118 |> fromRows
118119 |> fun ( a , p ) ->
119120 a
120121 | None -> failwithf " Metadata sheetname %s could not be found" sheetName
121122
122123 /// Try get persons from metadatasheet with given sheetName
123124 let getPersons sheetName ( doc : SpreadsheetDocument ) =
125+ let sst = Spreadsheet.tryGetSharedStringTable doc
124126 match Spreadsheet.tryGetSheetBySheetName sheetName doc with
125127 | Some sheet ->
126128 sheet
127129 |> SheetData.getRows
128- |> Seq.map ( Row.getIndexedValues None >> Seq.map ( fun ( i , v ) -> ( int i) - 1 , v))
130+ |> Seq.map ( Row.getIndexedValues sst >> Seq.map ( fun ( i , v ) -> ( int i) - 1 , v))
129131 |> fromRows
130132 |> fun ( a , p ) ->
131133 p
@@ -134,14 +136,15 @@ module MetaData =
134136 /// Replaces assay metadata from metadatasheet with given sheetName
135137 let overwriteWithAssayInfo sheetName assay ( doc : SpreadsheetDocument ) =
136138
139+ let sst = Spreadsheet.tryGetSharedStringTable doc
137140 let workBookPart = Spreadsheet.getWorkbookPart doc
138- let newSheet = SheetData.empty()
139-
141+ let newSheet = SheetData.empty()
142+
140143 match Spreadsheet.tryGetSheetBySheetName sheetName doc with
141144 | Some sheet ->
142145 sheet
143146 |> SheetData.getRows
144- |> Seq.map ( Row.getIndexedValues None >> Seq.map ( fun ( i , v ) -> ( int i) - 1 , v))
147+ |> Seq.map ( Row.getIndexedValues sst >> Seq.map ( fun ( i , v ) -> ( int i) - 1 , v))
145148 |> fromRows
146149 |> fun ( _ , p ) ->
147150
@@ -163,14 +166,15 @@ module MetaData =
163166 /// Replaces persons from metadatasheet with given sheetName
164167 let overwriteWithPersons sheetName persons ( doc : SpreadsheetDocument ) =
165168
169+ let sst = Spreadsheet.tryGetSharedStringTable doc
166170 let workBookPart = Spreadsheet.getWorkbookPart doc
167- let newSheet = SheetData.empty()
168-
171+ let newSheet = SheetData.empty()
172+
169173 match Spreadsheet.tryGetSheetBySheetName sheetName doc with
170174 | Some sheet ->
171175 sheet
172176 |> SheetData.getRows
173- |> Seq.map ( Row.getIndexedValues None >> Seq.map ( fun ( i , v ) -> ( int i) - 1 , v))
177+ |> Seq.map ( Row.getIndexedValues sst >> Seq.map ( fun ( i , v ) -> ( int i) - 1 , v))
174178 |> fromRows
175179 |> fun ( a , _ ) ->
176180 toRows ( Option.defaultValue Assay.empty a) persons
0 commit comments