keep fetcher in sync with the new gavagai translate call

ngrunwald · Aug 16, 2012 · 5c4ebfb · 5c4ebfb
1 parent 56b5231
commit 5c4ebfb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/clj_rome/fetcher.clj b/src/clj_rome/fetcher.clj
@@ -3,8 +3,9 @@
                                              LinkedHashMapFeedInfoCache HashMapFeedInfoCache)
            (com.sun.syndication.fetcher FetcherListener)
            (java.net URL))
-  (:use [clojure.java.io :as io]
-        [gavagai.core :as gav]))
+  (:require [clojure.java.io :as io]
+            [gavagai.core :as gav]
+            [clj-rome.reader :as r]))
 
 (def ^{:dynamic true} *fetcher*)
 
@@ -34,10 +35,9 @@
      (HttpURLFeedFetcher. (apply build-feed-cache args))))
 
 (defn retrieve-feed
-  "retrieves a feed from a fetcher or the default one.
-   Returns a SyndFeedImpl object"
+  "retrieves a feed from a fetcher or the default one."
   ([fetcher url]
-     (gav/translate (.retrieveFeed fetcher (URL. (str url)))))
+     (gav/translate (.retrieveFeed fetcher (URL. (str url))) {:nspace r/local-ns}))
   ([url]
      (retrieve-feed *fetcher* url)))
 

diff --git a/src/clj_rome/reader.clj b/src/clj_rome/reader.clj
@@ -5,6 +5,8 @@
   (:require [clojure.string :as str]
             [gavagai.core :as gav]))
 
+(def local-ns (find-ns 'clj-rome.reader))
+
 (defprotocol Feedable
   (make-reader [arg]))
 
@@ -46,4 +48,4 @@
   (let
       [reader (make-reader arg)
        feed (.build (SyndFeedInput.) reader)]
-    (gav/translate feed {:nspace (find-ns 'clj-rome.reader)})))
+    (gav/translate feed {:nspace local-ns})))