[add more info to htmlheader
Ketil Malde **20080114184146] {
hunk ./src/Html.hs 15
+import Data.ByteString.Lazy.Char8 (unpack)
hunk ./src/Html.hs 28
-htmlheader hs = doctype ++ "" ++ renderHtmlFragment (header << thetitle << "Blast")
- ++ "" ++ renderHtmlFragment (h1 << "Blast results") ++ "\n\n"
+
+htmlheader b hs = doctype ++ "" ++ renderHtmlFragment (header << thetitle << "Blast")
+ ++ "" ++ renderHtmlFragment pagehdr ++ "\n\n"
hunk ./src/Html.hs 32
+ where pagehdr = (h1 << "Blast results")
+ +++ p ((toHtml ("Program: "++unpack (blastversion b)))
+ +++ br +++ toHtml ("Database: "++ unpack (database b)))
hunk ./src/Xml2X.hs 67
- Html -> readXMLs (inputs opts) >>= htmlize opts tabulator . concatMap results
+ Html -> readXMLs (inputs opts) >>= htmlize opts tabulator
hunk ./src/Xml2X.hs 107
-csvize, htmlize :: Options -> ([String], BlastRecord -> [[String]]) -> [BlastRecord] -> IO ()
-
+csvize :: Options -> ([String], BlastRecord -> [[String]]) -> [BlastRecord] -> IO ()
+htmlize :: Options -> ([String], BlastRecord -> [[String]]) -> [BlastResult] -> IO ()
hunk ./src/Xml2X.hs 117
- brs' <- count opts 10 "Generating output: " brs
+ brs' <- count opts 10 "Generating output: " $ concatMap results brs
hunk ./src/Xml2X.hs 119
- hPutStr h (htmlheader header)
+ hPutStr h (htmlheader (head brs) header)
}