Revision f94a9680 htools/Ganeti/Query/Query.hs

b/htools/Ganeti/Query/Query.hs
79 79
mkUnknownFDef :: String -> FieldData a b
80 80
mkUnknownFDef name =
81 81
  ( FieldDefinition name name QFTUnknown ("Unknown field '" ++ name ++ "'")
82
  , FieldUnknown )
82
  , FieldUnknown
83
  , QffNormal )
83 84

  
84 85
-- | Runs a field getter on the existing contexts.
85 86
execGetter :: ConfigData -> b -> a -> FieldGetter a b -> ResultEntry
......
161 162
  runResultT $ do
162 163
  cfilter <- resultT $ compileFilter nodeFieldsMap qfilter
163 164
  let selected = getSelectedFields nodeFieldsMap fields
164
      (fdefs, fgetters) = unzip selected
165
      (fdefs, fgetters, _) = unzip3 selected
165 166
      live' = live && needsLiveData fgetters
166 167
  nodes <- resultT $ case wanted of
167 168
             [] -> Ok . niceSortKey nodeName .
......
182 183
  return $ do
183 184
  cfilter <- compileFilter groupFieldsMap qfilter
184 185
  let selected = getSelectedFields groupFieldsMap fields
185
      (fdefs, fgetters) = unzip selected
186
      (fdefs, fgetters, _) = unzip3 selected
186 187
  groups <- case wanted of
187 188
              [] -> Ok . niceSortKey groupName .
188 189
                    Map.elems . fromContainer $ configNodegroups cfg
......
202 203
  let selected = if null fields
203 204
                   then map snd $ Map.toAscList fieldsMap
204 205
                   else getSelectedFields fieldsMap fields
205
  in QueryFieldsResult (map fst selected)
206
  in QueryFieldsResult (map (\(defs, _, _) -> defs) selected)
206 207

  
207 208
-- | Query fields call.
208 209
queryFields :: QueryFields -> ErrorResult QueryFieldsResult

Also available in: Unified diff