Browse Source

bugfix in date generation

master
Christian Mueller 14 years ago
parent
commit
87768f1a98
  1. 11
      src/NoteHub/storage.clj
  2. 6
      src/NoteHub/views/pages.clj

11
src/NoteHub/storage.clj

@ -5,8 +5,6 @@
(def note "note") (def note "note")
(def draft "draft")
(defn- build-key [[year month day] key] (defn- build-key [[year month day] key]
(print-str year month day key)) (print-str year month day key))
@ -16,14 +14,5 @@
(defn get-note [date key] (defn get-note [date key]
(redis/hget db note (build-key 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] (defn note-exists? [date key]
(redis/hexists db note (build-key date key))) (redis/hexists db note (build-key date key)))

6
src/NoteHub/views/pages.clj

@ -64,14 +64,16 @@
; New Note Posting ; New Note Posting
(defpage [:post "/post-note"] {:keys [draft]} (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 %)) untrimmed-line (filter #(or (= \- %) (Character/isLetterOrDigit %))
(-> draft (split #"\n") first (sreplace " " "-") lower-case)) (-> draft (split #"\n") first (sreplace " " "-") lower-case))
trim (fn [s] (apply str (drop-while #(= \- %) s))) trim (fn [s] (apply str (drop-while #(= \- %) s)))
title-uncut (-> untrimmed-line trim reverse trim reverse) title-uncut (-> untrimmed-line trim reverse trim reverse)
proposed-title (apply str (take max-title-length title-uncut)) proposed-title (apply str (take max-title-length title-uncut))
date [year month day] date [year month day]
title (first (drop-while #(note-exists? date %) (cons proposed-title title (first (drop-while #(note-exists? date %)
(cons proposed-title
(map #(str proposed-title "-" (+ 2 %)) (range)))))] (map #(str proposed-title "-" (+ 2 %)) (range)))))]
(do (do
(set-note date title draft) (set-note date title draft)

Loading…
Cancel
Save