src/rss_thread_watch/feed_generator.clj

@@ -58,14 +58,41 @@
                               (:chod thread))))
 
 (defn make-filters
-  "Creates map of functions and filters from query string.
-   Return format is: {filter-fun ['words' 'to' 'filter' 'using this function]}"
-  [query-string known-filter-map]
-  (let [filterable (select-keys query-string
-                                (keys known-filter-map))]
+  "Creates map of functions and filters from query string"
+  ;; In future predicates could return matched parts of string instead of
+  ;; t/nil values which could be used for coloring of results
+  [query-map]
+  (let [filtering-params '("q" "Q")   ;Later add "r" for regex
+        filter-map (select-keys query-map filtering-params)]
     (ut/fkmap (fn [k v]
-                {(get known-filter-map k) v})
-              filterable)))
+                {(case k
+                   ;; regex filter here
+                   "q" f/case-insensitive-filter
+                   "Q" f/case-sensitive-filter) v})
+              filter-map)))
+
+
+(defn x [cache filters]
+  ;;must return fitlered cache
+  ;; {fun [key dfe dw kwd"]}
+  (filter
+   (fn [thread]
+     ;; run every function for each thread
+     (let [title (get thread :title)]
+       (some (fn [filter]
+               (let [queries (get filters filter)]
+                 (some (fn [q]
+                         (filter title queries))
+                       queries)
+                 ;; some again?
+                 ;; try some-map?
+                 ))
+             (keys filters)))
+     ;;RESUME
+     ) cache
+  ))
+
+
 
 (defn filter-chod-posts
   "Return list of all threads with equal or higher ChoD than requested

src/rss_thread_watch/filters.clj

@@ -28,9 +28,5 @@
 (defn case-insensitive-filter
   "Returns true if string [s] is case-matched by query"
   [s queries]
-  (case-sensitive-filter (cs/lower-case s) (map cs/lower-case queries)))
-
-(def known-filters
-  {"Q" case-sensitive-filter
-   "q" case-insensitive-filter})
+  (basic-filter (cs/lower-case s) (cs/lower-case s)))