From f5197d89bd389851aeb6f8b3483c0b2c42025af8 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 7 Jan 2010 11:44:24 +0100
Subject: [PATCH] Change the signatures of the text loader slightly
This is in preparation for the text format changes.
---
Ganeti/HTools/Text.hs | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Ganeti/HTools/Text.hs b/Ganeti/HTools/Text.hs
index efe8b48f1..f686d9791 100644
--- a/Ganeti/HTools/Text.hs
+++ b/Ganeti/HTools/Text.hs
@@ -80,11 +80,10 @@ loadInst _ s = fail $ "Invalid/incomplete instance data: '" ++ show s ++ "'"
-- @gnt-instance list@ and @gnt-node list@ to a list of objects using
-- a supplied conversion function.
loadTabular :: (Monad m, Element a) =>
- String -> ([String] -> m (String, a))
+ [String] -> ([String] -> m (String, a))
-> m ([(String, Int)], [(Int, a)])
-loadTabular text_data convert_fn = do
- let lines_data = lines text_data
- rows = map (sepSplit '|') lines_data
+loadTabular lines_data convert_fn = do
+ let rows = map (sepSplit '|') lines_data
kerows <- mapM convert_fn rows
return $ assignIndices kerows
@@ -97,7 +96,7 @@ loadData nfile ifile = do -- IO monad
idata <- readFile ifile
return $ do
{- node file: name t_mem n_mem f_mem t_disk f_disk -}
- (ktn, nl) <- loadTabular ndata loadNode
+ (ktn, nl) <- loadTabular (lines ndata) loadNode
{- instance file: name mem disk status pnode snode -}
- (_, il) <- loadTabular idata (loadInst ktn)
+ (_, il) <- loadTabular (lines idata) (loadInst ktn)
return (nl, il, [])
--
GitLab