Browse Source

fix: lowercase of nil

Tienson Qin 2 years ago
parent
commit
4bef35a8a0

+ 6 - 4
src/main/frontend/handler/external.cljs

@@ -59,10 +59,12 @@
                              (map
                                (fn [title]
                                  (let [day (date/journal-title->int title)
-                                       page-name (util/page-name-sanity-lc (date-time-util/int->journal-title day (state/get-date-formatter)))]
-                                   {:block/name page-name
-                                    :block/journal? true
-                                    :block/journal-day day}))
+                                       journal-title (date-time-util/int->journal-title day (state/get-date-formatter))]
+                                   (when journal-title
+                                     (let [page-name (util/page-name-sanity-lc journal-title)]
+                                       {:block/name page-name
+                                        :block/journal? true
+                                        :block/journal-day day}))))
                                titles))]
       (when (seq journal-pages-tx)
         (db/transact! repo journal-pages-tx)))))

+ 3 - 2
src/main/frontend/search/db.cljs

@@ -74,8 +74,9 @@
 
 (defn original-page-name->index
   [p]
-  {:name (util/search-normalize p (state/enable-search-remove-accents?))
-   :original-name p})
+  (when p
+    {:name (util/search-normalize p (state/enable-search-remove-accents?))
+     :original-name p}))
 
 (defn make-pages-title-indice!
   "Build a page title indice from scratch.

+ 5 - 4
src/main/frontend/util.cljc

@@ -933,10 +933,11 @@
    (defn search-normalize
      "Normalize string for searching (loose)"
      [s remove-accents?]
-     (let [normalize-str (.normalize (string/lower-case s) "NFKC")]
-       (if remove-accents?
-         (removeAccents  normalize-str)
-         normalize-str))))
+     (when s
+       (let [normalize-str (.normalize (string/lower-case s) "NFKC")]
+         (if remove-accents?
+           (removeAccents  normalize-str)
+           normalize-str)))))
 
 #?(:cljs
    (def page-name-sanity-lc