From 87768f1a98347435a0f18773435de18411088037 Mon Sep 17 00:00:00 2001 From: Christian Mueller Date: Wed, 30 May 2012 21:10:19 +0200 Subject: [PATCH] bugfix in date generation --- src/NoteHub/storage.clj | 11 ----------- src/NoteHub/views/pages.clj | 8 +++++--- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/NoteHub/storage.clj b/src/NoteHub/storage.clj index bc8e770..f55cda8 100644 --- a/src/NoteHub/storage.clj +++ b/src/NoteHub/storage.clj @@ -5,8 +5,6 @@ (def note "note") -(def draft "draft") - (defn- build-key [[year month day] key] (print-str year month day key)) @@ -16,14 +14,5 @@ (defn get-note [date key] (redis/hget db note (build-key date key))) -(defn create-draft [key] - (redis/hget db draft key)) - -(defn delete-draft [key] - (redis/hdel db draft key)) - -(defn draft-exists? [key] - (redis/hexists db draft key)) - (defn note-exists? [date key] (redis/hexists db note (build-key date key))) diff --git a/src/NoteHub/views/pages.clj b/src/NoteHub/views/pages.clj index 268b0f3..dbb2567 100644 --- a/src/NoteHub/views/pages.clj +++ b/src/NoteHub/views/pages.clj @@ -64,15 +64,17 @@ ; New Note Posting (defpage [:post "/post-note"] {:keys [draft]} - (let [[year month day] (map #(.get (Calendar/getInstance) %) [Calendar/YEAR Calendar/MONTH Calendar/DAY_OF_MONTH]) + (let [[year month day] (map #(+ (second %) (.get (Calendar/getInstance) (first %))) + {Calendar/YEAR 0, Calendar/MONTH 1, Calendar/DAY_OF_MONTH 0}) untrimmed-line (filter #(or (= \- %) (Character/isLetterOrDigit %)) (-> draft (split #"\n") first (sreplace " " "-") lower-case)) trim (fn [s] (apply str (drop-while #(= \- %) s))) title-uncut (-> untrimmed-line trim reverse trim reverse) proposed-title (apply str (take max-title-length title-uncut)) date [year month day] - title (first (drop-while #(note-exists? date %) (cons proposed-title - (map #(str proposed-title "-" (+ 2 %)) (range)))))] + title (first (drop-while #(note-exists? date %) + (cons proposed-title + (map #(str proposed-title "-" (+ 2 %)) (range)))))] (do (set-note date title draft) (redirect (apply str (interpose "/" ["" year month day title]))))))