X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcDom.hs;h=1205db51396250fedafb23fd843fe94bc1437198;hp=3b8f06018f039e69e324c40a48055be4386bf6cb;hb=4b66831c60d39decdc515fb7878ce3c0339684bd;hpb=444411783cdc992b99a6d9fe0e0a5922686d1931 diff --git a/NmcDom.hs b/NmcDom.hs index 3b8f060..1205db5 100644 --- a/NmcDom.hs +++ b/NmcDom.hs @@ -78,8 +78,8 @@ takeMap o = case H.lookup "map" o of Nothing -> pure Nothing Just (Object mo) -> do - unsplit <- (parseJSON (Object mo) :: Parser (Maybe (Map String NmcDom))) - let result = fmap splitup unsplit + raw <- (parseJSON (Object mo) :: Parser (Maybe (Map String NmcDom))) + let result = fmap splitup raw return result where splitup :: Map String NmcDom -> Map String NmcDom @@ -87,12 +87,12 @@ takeMap o = stow fqdn sdom acc = M.insertWith merge fqdn' sdom' acc where (fqdn', sdom') = nest (filter (/= "") (splitOnDots fqdn), sdom) - splitOnDots s = splitOn "." s - nest ([], v) = (fqdn, v) -- can split result be empty? + splitOnDots s = splitOn "." s + nest ([], v) = (fqdn, v) -- preserve "self" map entry nest ([k], v) = (k, v) nest (k:ks, v) = nest (ks, def { domSubmap = Just (M.singleton k v) }) - _ -> empty + _ -> empty takeSrv :: Object -> Parser (Maybe (Map String NmcDom)) takeSrv o =