[Fixes to the cabal files and clean up in the source trees. prb@mult.ifario.us**20080104055736] { hunk ./perpubplat/perpubplat.cabal 2 -version: 0.1 -copyright: Copyright 2007 Multifarious, Inc. +version: 0.9 +copyright: Copyright 2008 Multifarious, Inc. hunk ./perpubplat/perpubplat.cabal 5 -license: BSD +license: BSD3 hunk ./perpubplat/perpubplat.cabal 10 -build-depends: base >= 2.0, parsec >= 2.0, xhtml >= 3000, stm >= 2.0, haskell98, filepath >= 1.0 -exposed-modules: Blog.Entry, Blog.Storage, Blog.Presentation, - Blog.Routes, Blog.Views, Blog.Constants, +build-depends: base >= 2.0, parsec >= 2.0, xhtml >= 3000, haskell98, filepath >= 1.0, + old-time >= 1.0, containers, directory +exposed-modules: Utilities, + Blog.Constants, + Blog.Model.Entry, Blog.Model.EntryParser, + Blog.FrontEnd.Presentation, Blog.FrontEnd.Syndication, + Blog.FrontEnd.Routes, Blog.FrontEnd.Feeds, Blog.FrontEnd.Views, + Blog.FrontEnd.Actions, Blog.FrontEnd.Urls, + Blog.BackEnd.DataController, Blog.BackEnd.IoOperations, + Blog.BackEnd.ModelTransformations, + Blog.Widgets.TagCloud, hunk ./perpubplat/src/Blog/BackEnd/DataController.hs 9 -import System.Log.Logger - hunk ./perpubplat/src/Blog/BackEnd/DataController.hs 38 - do {writeChan (response_channel req) m + do {writeChan resp m hunk ./perpubplat/src/Blog/BackEnd/DataController.hs 41 - do { (s,m') <- MT.ingest_draft m d - ; writeChan (response_channel req) m' + do { (_,m') <- MT.ingest_draft m d + ; writeChan resp m' hunk ./perpubplat/src/Blog/BackEnd/IoOperations.hs 18 -import Control.Monad (filterM, liftM, msum, mplus) -import List (intersperse,sortBy,sort) +import Control.Monad (filterM) hunk ./perpubplat/src/Blog/BackEnd/ModelTransformations.hs 4 -import qualified Blog.Constants as C hunk ./perpubplat/src/Blog/BackEnd/ModelTransformations.hs 7 -import qualified System.Directory as D -import System.FilePath ( () ) hunk ./perpubplat/src/Blog/BackEnd/ModelTransformations.hs 10 -import System.Time - hunk ./perpubplat/src/Blog/BackEnd/ModelTransformations.hs 60 -squish_dashes s@(t:ts) (x:xs) | (t == x) && (x=='-') = squish_dashes s xs +squish_dashes s@(t:_) (x:xs) | (t == x) && (x=='-') = squish_dashes s xs hunk ./perpubplat/src/Blog/FrontEnd/Feeds.hs 2 - ( Feed ( AllPosts, ByTag, ByTags, PostComments, AllComments), + ( Feed ( AllPosts, ByTag, ByTags, PostComments, AllComments, tag, tags, permalink), hunk ./perpubplat/src/Blog/FrontEnd/Feeds.hs 11 -import Utilities (subst) hunk ./perpubplat/src/Blog/FrontEnd/Feeds.hs 100 -tag_feed :: String -> DiscoverableFeed -tag_feed = discoverable_feed . ByTag - -pad_ :: Int -> String -pad_ i | i < 10 = "-0" ++ (show i) - | otherwise = ('-':(show i)) +-- tag_feed :: String -> DiscoverableFeed +-- tag_feed = discoverable_feed . ByTag hunk ./perpubplat/src/Blog/FrontEnd/Presentation.hs 12 -import qualified Blog.Widgets.DeliciousBadge as DB -import qualified Blog.Widgets.DeliciousSidebarBadge as DSB -import qualified Blog.Widgets.RedditBadge as RB hunk ./perpubplat/src/Blog/FrontEnd/Presentation.hs 125 --- , sharing_block w b p hunk ./perpubplat/src/Blog/FrontEnd/Presentation.hs 129 -sharing_block :: (V.Viewable v) => v -> B.Model -> [B.Item] -> Html -sharing_block w b p | (V.kind w /= V.Single) = noHtml - | otherwise = concatHtml [ h3 $ stringToHtml "Sharing" - , DSB.delicious_sidebar_badge - , RB.reddit_badge (B.permalink b $ head p) "" ] - hunk ./perpubplat/src/Blog/FrontEnd/Presentation.hs 225 -{- -no_sharing :: B.Item -> Html -no_sharing = const $ noHtml - -sharing_as_badges :: B.Item -> Html -sharing_as_badges i = concatHtml [ h3 ! [ theclass "sharing" ] - << ( stringToHtml "Share \"" - +++ title - +++ stringToHtml "\"" ) - , RB.reddit_badge (post_permalink i) ("test") - , DB.delicious_badge ] - where - title = primHtml $ B.title i --} - hunk ./perpubplat/src/Blog/FrontEnd/Presentation.hs 226 -comment_heading model px comment +comment_heading model _ comment hunk ./perpubplat/src/Blog/FrontEnd/Presentation.hs 287 -sub_for_nothing s (Just t) = t +sub_for_nothing _ (Just t) = t hunk ./perpubplat/src/Blog/FrontEnd/Routes.hs 8 -import List (sort, intersperse) +import List (sort) hunk ./perpubplat/src/Blog/FrontEnd/Routes.hs 21 - Left err -> NoSuchUri $ u + Left _ -> NoSuchUri $ u hunk ./perpubplat/src/Blog/FrontEnd/Views.hs 4 - ByYMDPermatitle, ByPermatitle + ByYMDPermatitle, ByPermatitle, + year, month, day, page_n, permalink, tag, tags hunk ./perpubplat/src/Blog/FrontEnd/Views.hs 17 -import Text.XHtml.Strict (renderHtml) -import List (sort, intersperse, isPrefixOf, isSuffixOf) -import Utilities (subst) +import List (intersperse) hunk ./perpubplat/src/Blog/FrontEnd/Views.hs 53 -url_ (ByYMDPermatitle y m d t) = "/p/" ++ t +url_ (ByYMDPermatitle _ _ _ t) = "/p/" ++ t hunk ./perpubplat/src/Blog/Model/Entry.hs 10 -import List ( sortBy, groupBy, isPrefixOf, intersperse) +import List ( sortBy, isPrefixOf, intersperse) hunk ./perpubplat/src/Blog/Model/Entry.hs 323 -apply i [] = [] +apply _ [] = [] hunk ./perpubplat/src/Blog/Model/EntryParser.hs 4 -import Text.ParserCombinators.Parsec.Error (messageString) hunk ./perpubplat/src/Blog/Model/EntryParser.hs 5 -import qualified Blog.Constants as C hunk ./perpubplat/src/Blog/Widgets/DeliciousBadge.hs 1 -module Blog.Widgets.DeliciousBadge ( delicious_badge ) where - -import Text.XHtml.Strict ( Html, script, (!), (<<), (+++), stringToHtml, - concatHtml, thetype, src, noHtml ) - -delicious_badge :: Html -delicious_badge = concatHtml [ script ! [ thetype "text/javascript" ] << delicious_js - , script ! [ src "http://images.del.icio.us/static/js/blogbadge.js" ] << noHtml ] - -delicious_js :: Html -delicious_js = stringToHtml $ "if (typeof window.Delicious == \"undefined\") window.Delicious = {};\n" - ++ "Delicious.BLOGBADGE_DEFAULT_CLASS = 'delicious-blogbadge-line';" + rmfile ./perpubplat/src/Blog/Widgets/DeliciousBadge.hs hunk ./perpubplat/src/Blog/Widgets/DeliciousSidebarBadge.hs 1 -module Blog.Widgets.DeliciousSidebarBadge ( delicious_sidebar_badge ) where - -import Text.XHtml.Strict ( Html, script, (!), (<<), (+++), stringToHtml, - concatHtml, thetype, src, noHtml ) - -delicious_sidebar_badge :: Html -delicious_sidebar_badge = script ! [ src "http://images.del.icio.us/static/js/blogbadge.js" ] << noHtml - rmfile ./perpubplat/src/Blog/Widgets/DeliciousSidebarBadge.hs hunk ./perpubplat/src/Blog/Widgets/FlickrBadge.hs 3 -import qualified Blog.Model.Entry as B -import Text.XHtml.Strict ( Html, script, (!), (<<), stringToHtml, (+++), +import Text.XHtml.Strict ( Html, script, (!), (<<), hunk ./perpubplat/src/Blog/Widgets/RedditBadge.hs 1 -module Blog.Widgets.RedditBadge ( reddit_badge ) where - -import qualified Blog.Model.Entry as B -import Text.XHtml.Strict ( Html, script, (!), (<<), stringToHtml, (+++), thetype, src, noHtml ) - -reddit_badge :: String -> String -> Html -reddit_badge u t = ( script (stringToHtml $ concat ["reddit_url='",u,"'"] ) ) - +++ (script (stringToHtml $ concat ["reddit_title='",t,"'"]) ) - +++ ( script ! [ thetype "text/javascript", - src "http://reddit.com/button.js?t=1" ] - << noHtml) + rmfile ./perpubplat/src/Blog/Widgets/RedditBadge.hs hunk ./perpubplat/src/Blog/Widgets/TagCloud.hs 6 - concatHtml, noHtml, toHtml, hotlink, theclass, thediv ) + concatHtml, toHtml, hotlink, theclass, thediv ) hunk ./perpubplat/src/Text/Atom.hs 45 - author_name, author_uri, author_email, rel, href + author_name, author_uri, author_email, rel, href, + gen_name, gen_uri, gen_version hunk ./perpubplat/src/Text/Atom.hs 48 - AtomContent(AtomContent), + AtomContent(AtomContent, contentType, body), hunk ./perpubplat/src/Text/Atom.hs 50 - toXml,feed_link,feed_link_alt) where + toXml,feed_link,feed_link_alt, start_feed, end_feed) where hunk ./perpubplat_import/perpubplat_import.cabal 2 -version: 0.1 -copyright: Copyright 2007 Multifarious, Inc. +version: 0.9 +copyright: Copyright 2008 Multifarious, Inc. hunk ./perpubplat_import/perpubplat_import.cabal 5 -license: GPL +license: BSD hunk ./perpubplat_servlet/perpubplat_servlet.cabal 2 -version: 0.1 -copyright: Copyright 2007 Multifarious, Inc. +version: 0.9 +copyright: Copyright 2008 Multifarious, Inc. hunk ./perpubplat_servlet/perpubplat_servlet.cabal 5 -license: GPL +license: BSD3 hunk ./perpubplat_servlet/perpubplat_servlet.cabal 10 -build-depends: base >= 2.0, parsec >= 2.0, xhtml >= 3000, - fastcgi >= 3001.0.0, perpubplat >= 0.1 - - +build-depends: base >= 2.0, parsec >= 2.0, network >= 2.1, haskell98, containers, + fastcgi >= 3001.0.0, perpubplat >= 0.9, old-time >= 1.0, filepath >= 1.1, + directory >= 1.0, xhtml >= 3000.0.2.1 hunk ./perpubplat_servlet/src/blog.hs 3 -import qualified Blog.Model.Entry as B -import qualified Blog.Constants as C -import Utilities hunk ./perpubplat_servlet/src/blog.hs 15 -import System.Log.Logger -import System.Log.Handler.Simple hunk ./perpubplat_servlet/src/blog.hs 22 --- ; liftIO $ infoM "perpubplat" ("Responding to " ++ c) hunk ./perpubplat_servlet/src/blog.hs 47 -main = do { {-root_logger <- getLogger "perpubplat" - ; logfile <- fileHandler "/tmp/perpubplat.log" INFO - ; updateGlobalLogger "perpubplat" (setLevel DEBUG . addHandler logfile) - ; infoM "perpubplat" "Starting perpubplat system." -} - ; m <- O.boot +main = do { m <- O.boot hunk ./perpubplat_servlet/src/blog.hs 49 - ; infoM "perpubplat" "Startup complete; forking FastCGI handlers." }