[Slightly better handling of Flickr configuration bits. prb@mult.ifario.us**20080214081730] { hunk ./src/Blog/Constants.hs 88 + +flickr_user :: String +flickr_user = "92922008@N00" + +flickr_api_key :: String +flickr_api_key = "233b3c334c93b6f999f9b4b810f9d603" + hunk ./src/Blog/Widgets/ChromeBackEnd.hs 24 -boot m = do { (f,p) <- boot_flickr_collage +boot m = do { (f,p) <- boot_flickr_collage C.flickr_user C.flickr_api_key hunk ./src/Blog/Widgets/FlickrCollage.hs 26 - . concatHtml $ [ concatHtml . (map to_xhtml) $ images + . concatHtml $ [ concatHtml . (map (to_xhtml $ flickr_user fc)) $ images hunk ./src/Blog/Widgets/FlickrCollage.hs 34 -flickr_api_key :: String -flickr_api_key = "233b3c334c93b6f999f9b4b810f9d603" - hunk ./src/Blog/Widgets/FlickrCollage.hs 37 -flickr_view_url :: String -flickr_view_url = "http://www.flickr.com/photos/" ++ user_id ++ "/" - -user_id :: String -user_id = "92922008@N00" +flickr_view_url :: String -> String +flickr_view_url user_id = "http://www.flickr.com/photos/" ++ user_id ++ "/" hunk ./src/Blog/Widgets/FlickrCollage.hs 52 + , flickr_user :: String hunk ./src/Blog/Widgets/FlickrCollage.hs 63 -boot_flickr_collage :: IO (FlickrController, HttpPoller) -boot_flickr_collage = +boot_flickr_collage :: String -> String -> IO (FlickrController, HttpPoller) +boot_flickr_collage user_id api_key = hunk ./src/Blog/Widgets/FlickrCollage.hs 67 - ; let fc = FlickrController rc temp_tid + ; let fc = FlickrController rc user_id temp_tid hunk ./src/Blog/Widgets/FlickrCollage.hs 69 - ; p <- start_poller "FlickrCollage" (flickr_people_getPublicPhotos_req user_id) + ; p <- start_poller "FlickrCollage" (flickr_people_getPublicPhotos_req user_id api_key) hunk ./src/Blog/Widgets/FlickrCollage.hs 113 -flickr_people_getPublicPhotos_req :: String -> Request -flickr_people_getPublicPhotos_req user = Request url GET [ Header HdrAcceptCharset "utf-8" ] "" +flickr_people_getPublicPhotos_req :: String -> String -> Request +flickr_people_getPublicPhotos_req user api_key = Request url GET [ Header HdrAcceptCharset "utf-8" ] "" hunk ./src/Blog/Widgets/FlickrCollage.hs 116 - url = compose_uri flickr_service_url [ ("api_key", flickr_api_key) + url = compose_uri flickr_service_url [ ("api_key", api_key) hunk ./src/Blog/Widgets/FlickrCollage.hs 123 -to_xhtml :: FlickrPhoto -> Html -to_xhtml fp = _a (photo_page_url fp) ( image ! [ src (image_url fp) +to_xhtml :: String -> FlickrPhoto -> Html +to_xhtml user fp = _a (photo_page_url user fp) ( image ! [ src (image_url fp) hunk ./src/Blog/Widgets/FlickrCollage.hs 136 -photo_page_url :: FlickrPhoto -> String -photo_page_url fp = flickr_view_url ++ (photo_id fp) +photo_page_url :: String -> FlickrPhoto -> String +photo_page_url user fp = (flickr_view_url user) ++ (photo_id fp) }