View difference between Paste ID: gpikR7qc and epwZrjSz

-(ns retriver.core
+(ns retriever.core
-  (:gen-class))
+  (:require [clojure.string :as str]
             [clojure.pprint :refer [pprint]]))
-(def text (slurp "text\\potato.txt" :encoding "UTF-8"))
+
-(def countries (re-seq #".+(?=[\n,\r])|.+" (slurp "text\\countries.txt" :encoding "UTF-8")))
+(def text
-(def cities (re-seq #".+(?=[\n,\r])|.+" (slurp "text\\cities.txt" :encoding "UTF-8")))
+  (-> (slurp "resources/article.txt")
       (str/replace #"[\.,();]" "")
       (str/split #"\s+|—")
-(defn count-match [string,file]
+      frequencies))
-  (let [c (count (re-seq (re-pattern string)
+(def cities (next (str/split-lines (slurp "resources/city.txt"))))
-			 file))]
+(def countries (next (str/split-lines (slurp "resources/countries.txt"))))
-  (when (> c 0)
+
-	(format "%s : %d" string c))))
+(defn match [text file]
   (remove (fn [v] (let [[_ b] v] (nil? b)))
           (pmap (juxt (fn [a] a) text) file)))
-  (println (remove nil? (pmap (fn [word](count-match word text)) countries)))
+
-  (println (remove nil? (pmap (fn [word](count-match word text)) cities)))
+
-  (println "The end"))
+  (pprint (match text cities))
   (pprint (match text countries))
   (pprint "The End"))