Directory mk II)

1 files changed, 9 insertions, 8 deletions

diff --git a/src/site.clj b/src/site.clj
index 39050e0..5d5788f 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -124,6 +124,9 @@
 
 ;; Output
 
+(defn stringify-and-escape [m]
+  (zipmap (map name (keys m)) (map escape-html (vals m))))
+
 (defn process-message-for-json [d]
   (assoc d :created_on (.getTime (d :created_on))))
 
@@ -385,7 +388,7 @@
                       (min (count directory)
                            (* (inc offset) *per-directory-page*)))
         user-ids (apply str (interpose ", " (map #(%1 :user_id) users)))
-        qry (str "SELECT u.user_id, u.avatar, m.content "
+        qry (str "SELECT u.user_id, u.nick, u.avatar, m.content "
                  "FROM users u, messages m "
                  "WHERE u.user_id in (" user-ids ") "
                  "AND m.created_on = (select max(created_on) from messages "
@@ -394,13 +397,11 @@
       (let [res (do-select [qry])
             keys (map :user_id res)           
             dict (zipmap keys res)]
-        (map (fn [u]
-               (let [u-id (u :user_id)]
-                 (merge u (dict u-id))))
-               users)))))
-      
-      
-
+         (map (fn [u]
+                (let [u-id (u :user_id)]
+                  (stringify-and-escape (merge u (dict u-id)))))
+              users)))))
+           
 (defn update-directory! []
   (let [qry (str "SELECT u.user_id, COUNT(m) as cnt "
                  "FROM users u, messages m "