File tree Expand file tree Collapse file tree 1 file changed +15
-4
lines changed Expand file tree Collapse file tree 1 file changed +15
-4
lines changed Original file line number Diff line number Diff line change 186
186
187
187
(defn get-sheet
188
188
" Get sheet from file"
189
- ([filename sheetname]
190
- (get-sheet filename sheetname {}))
191
- ([filename sheetname options]
189
+ ([filename]
190
+ (get-sheet filename 1 {}))
191
+ ([filename sheetname-or-idx]
192
+ (get-sheet filename sheetname-or-idx {}))
193
+ ([filename sheetname-or-idx options]
192
194
(let [opts (merge defaults options)
193
195
row (:row opts)
194
196
hdr (:hdr opts)
195
197
row (if (and hdr (zero? row)) 1 row)
196
198
rows (:rows opts)
197
199
fxn (:fxn opts)
198
200
cols (map fxn (:columns opts))
199
- sheetid (:idx (first (filter #(= sheetname (:name %)) (get-sheet-names filename))))
201
+ sheetid (cond
202
+ (string? sheetname-or-idx)
203
+ (:idx (first (filter #(= sheetname-or-idx (:name %)) (get-sheet-names filename))))
204
+
205
+ (and (integer? sheetname-or-idx) (pos? sheetname-or-idx))
206
+ sheetname-or-idx
207
+
208
+ :else
209
+ (let [message (format " Attr 'sheetname-or-idx' can only be string or positive number, but passed '%s'" sheetname-or-idx)]
210
+ (throw (ex-info message {}))))
200
211
zf (ZipFile. ^String filename)
201
212
wb (.getEntry zf (str " xl/worksheets/sheet" sheetid " .xml" ))
202
213
ins (.getInputStream zf wb)
You can’t perform that action at this time.
0 commit comments