diff options
| -rw-r--r-- | bin/serve.fnl | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/bin/serve.fnl b/bin/serve.fnl index 8855120..9ebd0e8 100644 --- a/bin/serve.fnl +++ b/bin/serve.fnl @@ -2,7 +2,6 @@ (tset package :path (.. package.path ";./vendor/lpeglj/?.lua")) -(local io (require :io)) (local math (require :math)) (local fennel (require :vendor.fennel)) (local html (require :vendor.html)) @@ -32,6 +31,8 @@ "доска" "чабань" "лунцзин" "лун цзин" "лун цзин" "лунцзин" + "билочунь" "би ло чунь" + "би ло чунь" "билочунь" "чахай" "сливник" "сливник" "чахай" "чабань" "доска" @@ -62,7 +63,7 @@ "Желтый чай" "yellow-tea" "Посуда" "teaware"} category)) -(fn get-query-string [query key] +(fn query-string [query key] (if (and query (. query key) (. query key 1) @@ -70,7 +71,7 @@ (sanitize-input (. query key 1)) nil)) -(fn get-query-number [query key] +(fn query-number [query key] (if (and query (. query key) (. query key 1) @@ -85,14 +86,14 @@ (array.join (array.list flattened-object) "&")) (fn collect-form [params category] - {:query (or (get-query-string params "query") "") + {:query (or (query-string params "query") "") :tags (map #(sanitize-input $2) (filter #(~= "" $2) (or params.tags [category]))) - :site (or (get-query-string params "site") "") - :sort (or (get-query-string params "sort") "") - :min-price (get-query-number params "min-price") - :max-price (get-query-number params "max-price") - :price-per (= "on" (get-query-string params "price-per"))}) + :site (or (query-string params "site") "") + :sort (or (query-string params "sort") "") + :min-price (query-number params "min-price") + :max-price (query-number params "max-price") + :price-per (= "on" (query-string params "price-per"))}) (fn form-empty? [form] (and @@ -490,7 +491,7 @@ (do (fn respond [query category] (let [headers {:content-type "text/html"} - page (or (get-query-number query "page") 1) + page (or (query-number query "page") 1) form (collect-form query category) {: results : total} (if (not (form-empty? form)) |