Renamed db to *db*

2 files changed, 19 insertions, 17 deletions

diff --git a/src/site.clj b/src/site.clj
index 167f4d5..fcd2930 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -155,12 +155,6 @@
 
 (def *dumps-per-page* 20)
 
-(defn maybe-parse-int [s f]
-  (if s (Integer/parseInt s) f))
-
-(defn maybe-parse-long [s f]
-  (if s (Long/parseLong s) f))
-
 (defn count-messages-by-room [room-id image-only]
   (let [query (str "SELECT COUNT(*) "
 		   "FROM messages m, users u "
@@ -301,7 +295,7 @@
 	invalid-nick-reason (is-invalid-nick? nick)]
     (cond invalid-nick-reason (resp-error invalid-nick-reason)
 	  (fetch-nick nick) (resp-error "NICK_TAKEN")
-	  :else (with-connection db
+	  :else (with-connection *db*
 		  (insert-values :users
 				 [:nick :hash :email]
 				 [nick hash email])
@@ -338,7 +332,7 @@
 
 
 (defn update-user-db [user-id attr val]
-  (with-connection db
+  (with-connection *db*
     (update-values "users" ["user_id = ?" user-id] {attr val})))
 
 (defn download-avatar [session url]
@@ -430,7 +424,7 @@
   (let [is-image (is-image? content) 
 	qry (str "INSERT INTO messages (user_id, room_id, content, is_image) "
 		 "VALUES (?, ?, ?, ?) RETURNING message_id")] 
-    (with-connection db
+    (with-connection *db*
       ((first (do-select [qry user-id room-id content is-image]))
        :message_id))))
 
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