[Delete the Web.Text module, move all the HTML/URL bits to General.Web
Neil Mitchell**20101119070138] {
hunk ./hoogle.cabal 157
-        Web.Text
hunk ./src/Data/TagStr.hs 13
-import Numeric
+import General.Web
hunk ./src/Data/TagStr.hs 95
-                  url = if "http:" `isPrefixOf` str then str else "?hoogle=" +% str
-        g (TagHyperlink url x) = "<a href=\"" +& url ++ "\">" ++ showTagHTML x ++ "</a>"
+                  url = if "http:" `isPrefixOf` str then str else "?hoogle=" ++% str
+        g (TagHyperlink url x) = "<a href=\"" ++& url ++ "\">" ++ showTagHTML x ++ "</a>"
hunk ./src/Data/TagStr.hs 99
-
--- FIXME: Should not be here!
-a +& b = a ++ escapeHTML b
-a +% b = a ++ escapeCGI b
-escapeHTML = concatMap f
-    where
-        f '\"' = "&quot;"
-        f '<' = "&lt;"
-        f '>' = "&gt;"
-        f '&' = "&amp;"
-        f '\n' = "<br/>"
-        f x = [x]
-escapeCGI = concatMap f
-    where
-        f x | isAlphaNum x || x `elem` "-" = [x]
-            | x == ' ' = "+"
-            | otherwise = '%' : ['0'|length s == 1] ++ s
-            where s = showHex (ord x) ""
-
hunk ./src/General/Util.hs 19
+
+-- | Only append strings if neither one is empty
+(++?) :: String -> String -> String
+a ++? b = if null a || null b then [] else a ++ b
hunk ./src/General/Web.hs 8
-    combineURL, escapeURL, unescapeURL,
-    escapeHTML,
+    combineURL, escapeURL, (++%), unescapeURL,
+    escapeHTML, (++&),
hunk ./src/General/Web.hs 35
+-- | Escape the second argument as HTML before appending
+(++&) :: String -> String -> String
+a ++& b = a ++ escapeHTML b
+
+
hunk ./src/General/Web.hs 58
-escapeURL (x:xs) | isAlphaNum x = x : escapeURL xs
-                 | otherwise = '%' : f (showHex (ord x) "") ++ escapeURL xs
-    where f x = ['0' | length x == 1] ++ x
-escapeURL [] = []
+escapeURL = concatMap f
+    where
+        f x | isAlphaNum x || x `elem` "-" = [x]
+            | x == ' ' = "+"
+            | otherwise = '%' : ['0'|length s == 1] ++ s
+            where s = showHex (ord x) ""
+
hunk ./src/General/Web.hs 66
+-- | Escape the second argument as a CGI query string before appending
+(++%) :: String -> String -> String
+a ++% b = a ++ escapeURL b
hunk ./src/Web/Page.hs 4
-import Web.Text
+import General.Web
+import General.Util
+
hunk ./src/Web/Page.hs 13
-    ,"     <title>" ++ (query +? " - ") ++ "Hoogle</title>"
+    ,"     <title>" ++ (query ++? " - ") ++ "Hoogle</title>"
hunk ./src/Web/Page.hs 77
-        search x = "<a href='?hoogle=" +% x ++ "'>" +& x ++ "</a><br/>"
+        search x = "<a href='?hoogle=" ++% x ++ "'>" ++& x ++ "</a><br/>"
hunk ./src/Web/Response.hs 8
+import General.Web
hunk ./src/Web/Response.hs 10
-import Web.Text
hunk ./src/Web/Response.hs 14
-import General.Web hiding (escapeHTML)
hunk ./src/Web/Response.hs 65
-    ,"  Query: <tt>" +& pre ++ "<span id='error'>" +& post2 ++ "</span></tt><br/>"
+    ,"  Query: <tt>" ++& pre ++ "<span id='error'>" ++& post2 ++ "</span></tt><br/>"
hunk ./src/Web/Response.hs 67
-    ,"  Error: " +& txt ++ "<br/>"
+    ,"  Error: " ++& txt ++ "<br/>"
hunk ./src/Web/Response.hs 99
-        moreResults = "<tr><td></td><td><a href=\"" +& urlMore ++ "\" class='more'>Show more results</a></td></tr>"
-        urlMore = "?hoogle=" +% queryText cq ++ "&start=" ++ show (start2+count2+1) ++ "#more"
+        moreResults = "<tr><td></td><td><a href=\"" ++& urlMore ++ "\" class='more'>Show more results</a></td></tr>"
+        urlMore = "?hoogle=" ++% queryText cq ++ "&start=" ++ show (start2+count2+1) ++ "#more"
hunk ./src/Web/Response.hs 103
-        qurl (TagHyperlink url x) | "query:" `isPrefixOf` url = TagHyperlink ("?hoogle=" +% drop 6 url) x
+        qurl (TagHyperlink url x) | "query:" `isPrefixOf` url = TagHyperlink ("?hoogle=" ++% drop 6 url) x
hunk ./src/Web/Response.hs 127
-                   "<a class='docs' onclick='return docs(" ++ show i ++ ")' href='" +& selfUrl ++ "'></a>") +?
-                   (showTagHTML docs) +?
+                   "<a class='docs' onclick='return docs(" ++ show i ++ ")' href='" ++& selfUrl ++ "'></a>") ++?
+                   (showTagHTML docs) ++?
hunk ./src/Web/Response.hs 133
-            | otherwise = Just $ "</a><a class='a' href='" +& selfUrl ++ "'>" ++ showTagHTML (transform g x) ++
-                                 "</a><a class='dull' href='" +& selfUrl ++ "'>"
+            | otherwise = Just $ "</a><a class='a' href='" ++& selfUrl ++ "'>" ++ showTagHTML (transform g x) ++
+                                 "</a><a class='dull' href='" ++& selfUrl ++ "'>"
hunk ./src/Web/Response.hs 143
-href url x = if null url then x else "<a class='dull' href='" +& url ++ "'>" ++ x ++ "</a>"
+href url x = if null url then x else "<a class='dull' href='" ++& url ++ "'>" ++ x ++ "</a>"
hunk ./src/Web/Text.hs 1
-
--- | FIXME: Most of this module should be moved elsewhere
-module Web.Text where
-
-import General.Code
-import Numeric
-
-
--- | Only append strings if neither one is empty
-(+?) :: String -> String -> String
-a +? b = if null a || null b then [] else a ++ b
-
--- | Escape the second argument as HTML before appending
-(+&) :: String -> String -> String
-a +& b = a ++ escapeHTML b
-
--- | Escape the second argument as a CGI query string before appending
-(+%) :: String -> String -> String
-a +% b = a ++ escapeCGI b
-
-
--- TODO: Should be somewhere else
-escapeHTML = concatMap f
-    where
-        f '\"' = "&quot;"
-        f '<' = "&lt;"
-        f '>' = "&gt;"
-        f '&' = "&amp;"
-        f '\n' = "<br/>"
-        f x = [x]
-
-escapeCGI = concatMap f
-    where
-        f x | isAlphaNum x || x `elem` "-" = [x]
-            | x == ' ' = "+"
-            | otherwise = '%' : ['0'|length s == 1] ++ s
-            where s = showHex (ord x) ""
rmfile ./src/Web/Text.hs
}