Revision f5197d89 Ganeti/HTools/Text.hs
b/Ganeti/HTools/Text.hs | ||
---|---|---|
80 | 80 |
-- @gnt-instance list@ and @gnt-node list@ to a list of objects using |
81 | 81 |
-- a supplied conversion function. |
82 | 82 |
loadTabular :: (Monad m, Element a) => |
83 |
String -> ([String] -> m (String, a))
|
|
83 |
[String] -> ([String] -> m (String, a))
|
|
84 | 84 |
-> m ([(String, Int)], [(Int, a)]) |
85 |
loadTabular text_data convert_fn = do |
|
86 |
let lines_data = lines text_data |
|
87 |
rows = map (sepSplit '|') lines_data |
|
85 |
loadTabular lines_data convert_fn = do |
|
86 |
let rows = map (sepSplit '|') lines_data |
|
88 | 87 |
kerows <- mapM convert_fn rows |
89 | 88 |
return $ assignIndices kerows |
90 | 89 |
|
... | ... | |
97 | 96 |
idata <- readFile ifile |
98 | 97 |
return $ do |
99 | 98 |
{- node file: name t_mem n_mem f_mem t_disk f_disk -} |
100 |
(ktn, nl) <- loadTabular ndata loadNode
|
|
99 |
(ktn, nl) <- loadTabular (lines ndata) loadNode
|
|
101 | 100 |
{- instance file: name mem disk status pnode snode -} |
102 |
(_, il) <- loadTabular idata (loadInst ktn)
|
|
101 |
(_, il) <- loadTabular (lines idata) (loadInst ktn)
|
|
103 | 102 |
return (nl, il, []) |
Also available in: Unified diff