Merge branch 'master' of ssh://sostler@192.168.0.194/~/dumpfm

1 files changed, 16 insertions, 8 deletions

diff --git a/src/utils.clj b/src/utils.clj
index 3ffd54b..33a247f 100755
--- a/src/utils.clj
+++ b/src/utils.clj
@@ -7,11 +7,11 @@
 (let [db-host "localhost"
       db-port 5432
       db-name "dumpfm"]
-  (def db {:classname "org.postgresql.Driver"
-           :subprotocol "postgresql"
-           :subname (str "//" db-host ":" db-port "/" db-name)
-           :user "postgres"
-           :password "root"}))
+  (def *db* {:classname "org.postgresql.Driver"
+             :subprotocol "postgresql"
+             :subname (str "//" db-host ":" db-port "/" db-name)
+             :user "postgres"
+             :password "root"}))
 
 ;; JSON responses
 
@@ -30,12 +30,12 @@
 ;; Database
 
 (defn do-select [query]
-  (with-connection db
+  (with-connection *db*
     (with-query-results rs query
       (doall rs))))
 
 (defn do-count [query]
-  ((first (with-connection db
+  ((first (with-connection *db*
 	    (with-query-results rs query
 	      (doall rs))))
    :count))
@@ -72,4 +72,12 @@
 (defn validated-stats [session params]
   (if (session :is_admin)
     (stats session params)
-    (resp-error "BAD_REQUEST")))
\ No newline at end of file
+    (resp-error "BAD_REQUEST")))
+
+;; Parsing
+
+(defn maybe-parse-int [s f]
+  (if s (Integer/parseInt s) f))
+
+(defn maybe-parse-long [s f]
+  (if s (Long/parseLong s) f))
\ No newline at end of file