fixes commit problems, bad vendors

src/clj/auto_ap/graphql/vendors.clj

@@ -199,15 +199,14 @@
 
 (defn rebuild-search-index []
   (de/future-with
-    single-thread
+   single-thread
-    (auto-ap.solr/index-documents-raw
+   (auto-ap.solr/index-documents-raw
-      auto-ap.solr/impl
+    auto-ap.solr/impl
-      "vendors"
+    "vendors"
-      (for [[result] (dc/qseq {:query '[:find (pull ?v [:vendor/search-terms :db/id :vendor/name :vendor/hidden])
+    (for [[result] (dc/qseq {:query '[:find (pull ?v [:vendor/search-terms :db/id :vendor/name :vendor/hidden])
-                                        :in $
+                                      :in $
-                                        :where [?v :vendor/search-terms ]]
+                                      :where [?v :vendor/name]]
-                               :args  [(dc/db conn)]})]
+                             :args  [(dc/db conn)]})]
-        {"id"     (:db/id result)
+      {"id"     (:db/id result)
-         "name"   (or (first (:vendor/search-terms result))
+       "name"   (:vendor/name result)
-                      (:vendor/name result))
+       "hidden" (boolean (:vendor/hidden result))}))))
-         "hidden" (boolean (:vendor/hidden result))}))))

src/clj/auto_ap/parse/templates.clj

@@ -4,8 +4,7 @@
 
 
 (def pdf-templates
-  [
+  [;; CHEF's WAREHOUSE
-   ;; CHEF's WAREHOUSE
    {:vendor "CHFW"
     :keywords [#"CHEF'S WAREHOUSE"]
     :extract {:total #"2 WKS C\.C\.\s+([\d.,]+)"
@@ -75,9 +74,7 @@
     :parser {:date [:clj-time "MM/dd/yy"]
              :total [:trim-commas-and-negate nil]}}
 
-
+;; SOUTHBAY FRESH
-
-   ;; SOUTHBAY FRESH
    {:vendor "Southbay Fresh Produce"
     :keywords [#"SOUTH BAY FRESH PRODUCE"]
     :extract {:date #"^([0-9]+/[0-9]+/[0-9]+)"
@@ -173,10 +170,9 @@
     :parser {:date [:clj-time "MM/dd/yy"]
              :total [:trim-commas nil]}
     :multi (. java.util.regex.Pattern (compile (-> \formfeed str) java.util.regex.Pattern/CASE_INSENSITIVE))
-    :multi-match? #"(Total\s+[0-9\.]+|Total Order)"
+    :multi-match? #"(Total\s+[0-9\.]+|Total Order)"}
-    }
 
-   ;; AUTO-CHLOR
+;; AUTO-CHLOR
    {:vendor "Auto-Chlor"
     :keywords [#"AUTO-CHLOR"]
     :extract {:date #"DATE : ([0-9]+/[0-9]+/[0-9]+)"
@@ -208,8 +204,7 @@
     :multi #"\n"
     :multi-match? #"^\s+.*?\d{6,}.*?\$"}
 
-
+;; C & L
-   ;; C & L
    {:vendor "C&L Produce"
     :keywords [#"440 Franklin Street"]
     :extract {:date #"([0-9]+/[0-9]+/[0-9]+)"
@@ -239,8 +234,7 @@
     :parser   {:date  [:clj-time "dd-MMM-yy"]
                :total [:trim-commas-and-negate nil]}}
 
-
+;;; credits don't have the same format
-   ;;; credits don't have the same format
    {:vendor "General Produce Company"
     :keywords [#"1330 NORTH B"]
     :extract {:date #"DATE.*\n.*\n.*?([0-9]+/[0-9]+/[0-9]+)"
@@ -362,9 +356,7 @@
     :parser {:date [:clj-time "MM/dd/yyyy"]
              :total [:trim-commas nil]}}
 
-
+;; PACIFIC SEAFOOD
-
-   ;; PACIFIC SEAFOOD
    {:vendor "Pacific Seafood"
     :keywords [#"(pacseafood|PACIFIC FRESH)"]
     :extract {:date #"DATE(?:.*\n.*(?=([0-9]+/[0-9]+/[0-9]+)))([0-9]+/[0-9]+/[0-9]+)"
@@ -426,8 +418,7 @@
               :total #" Total:\s+([\d\.]+)"}
     :parser {:date [:clj-time "MMM dd, yyyy"]}}
 
-
+;; A&B
-   ;; A&B
    {:vendor "A&B Produce"
     :keywords [#"ABProduce"]
     :extract {:date #"^\s+([0-9]+/[0-9]+/[0-9]+)"
@@ -560,9 +551,7 @@
     :parser {:date [:clj-time "MM/dd/yy"]
              :total [:trim-commas nil]}}
 
-   
+;; JFC
-
-   ;; JFC
    {:vendor "JFC International"
     :keywords [#"48490 MILMONT DRIVE"]
     :extract {:date #"([0-9]+/[0-9]+/[0-9]+)"
@@ -609,6 +598,15 @@
               :customer-identifier #"Bill To\s+(.*?)\s{2,}"
               :invoice-number #"Invoice #\n.*?([\d\-]+)\n"
               :total #"Invoice Total\s+([\d\-,]+\.\d{2,2}+)"}
+    :parser {:date [:clj-time "MM/dd/yy"]
+             :total [:trim-commas-and-negate nil]}}
+
+   {:vendor "Reel Produce"
+    :keywords [#"reelproduce.com"]
+    :extract {:date #"([0-9]+/[0-9]+/[0-9]+)"
+              :customer-identifier #"Bill To(?:.*?)\n\n\s+(.*?)\s{2,}"
+              :invoice-number #"Invoice #\n.*?([\d\-]+)\n"
+              :total #"Total\s*\n\s+\$([\d\-,]+\.\d{2,2}+)"}
     :parser {:date [:clj-time "MM/dd/yy"]
              :total [:trim-commas-and-negate nil]}}])
 

src/clj/auto_ap/solr.clj

@@ -136,7 +136,8 @@
   (index-documents-raw [this index xs]
     (client/post
       (str (assoc (url/url solr-uri "solr" index "update")
-                  :query {"commitWithin" 5000}))
+                  :query {"commitWithin" 5000
+                          "commit" true}))
       
       {:headers            {"Content-Type" "application/json"}
        :socket-timeout     30000
@@ -147,7 +148,8 @@
   (index-documents [this index xs]
     (client/post
       (str (assoc (url/url solr-uri "solr" index "update")
-                   :query {"commitWithin" 5000}))
+                   :query {"commitWithin" 5000
+                           "commit" true}))
       {:headers            {"Content-Type" "application/json"}
        :socket-timeout     30000
        :connection-timeout 30000
@@ -168,7 +170,8 @@
   (delete [this index]
     (client/post
       (str (assoc (url/url solr-uri "solr" index "update")
-                  :query {"commitWithin" 15000}))
+                  :query {"commitWithin" 15000
+                          "commit" true}))
       {:headers {"Content-Type" "application/json"}
        :method  "POST"
        :body    (json/write-str {"delete" {"query" "*:*"}})})))