DVW statements

src/clj/auto_ap/parse/excel.clj

@@ -10,38 +10,40 @@
   (every? #(re-find % text) keywords))
 
 (defn extract [wb {:keys [extract vendor]}]
-  (reduce-kv
-   (fn [invoice k [regex offset-row offset-column extract-regex]]
-     (assoc invoice k
-            (->> wb
-                 (d/sheet-seq)
-                 first
-                 (d/cell-seq)
-                 (filter (fn [cell]
-                           (re-find regex (str (d/read-cell cell)))))
-                 (map (fn [cell]
-                        (let [address (.getAddress cell)
-                              cell-value (str (d/read-cell (d/select-cell  (.toString (CellAddress. (+ offset-row (.getRow address)) (+ offset-column (.getColumn address)) ))
-                                                            (first (d/sheet-seq wb)))))] 
-                          (if extract-regex
-                            (second (re-find extract-regex cell-value))
-                            
-                            cell-value))))
-                 first)))
-   {:vendor-code vendor}
-   extract))
+  (if (fn? extract)
+    (extract wb vendor)
+    [(reduce-kv
+      (fn [invoice k [regex offset-row offset-column extract-regex]]
+        (assoc invoice k
+               (->> wb
+                    (d/sheet-seq)
+                    first
+                    (d/cell-seq)
+                    (filter (fn [cell]
+                              (re-find regex (str (d/read-cell cell)))))
+                    (map (fn [cell]
+                           (let [address (.getAddress cell)
+                                 cell-value (str (d/read-cell (d/select-cell  (.toString (CellAddress. (+ offset-row (.getRow address)) (+ offset-column (.getColumn address)) ))
+                                                                              (first (d/sheet-seq wb)))))] 
+                             (if extract-regex
+                               (second (re-find extract-regex cell-value))
+                               
+                               cell-value))))
+                    first)))
+      {:vendor-code vendor}
+      extract)]))
 
 (defn parse-file
   [file filename]
-  [(let [wb (d/load-workbook file)
-         text (->> wb
-                   (d/sheet-seq)
-                   first
-                   (d/cell-seq)
-                   (map d/read-cell)
-                   (str/join " "))]
-     (->> t/excel-templates
-          (filter (partial template-applies? text))
-          first
-          (extract wb)
-          ))])
+  (let [wb (d/load-workbook file)
+        text (->> wb
+                  (d/sheet-seq)
+                  first
+                  (d/cell-seq)
+                  (map d/read-cell)
+                  (str/join " "))]
+    (->> t/excel-templates
+         (filter (partial template-applies? text))
+         first
+         (extract wb)
+         )))