X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcDom.hs;h=3b8f06018f039e69e324c40a48055be4386bf6cb;hp=4887ab7290a3e40c5dc4714ced2019896e9b381e;hb=444411783cdc992b99a6d9fe0e0a5922686d1931;hpb=3622e1a7dfae1cc6ecb3b63bf79980ae60b7eac7

diff --git a/NmcDom.hs b/NmcDom.hs
index 4887ab7..3b8f060 100644
--- a/NmcDom.hs
+++ b/NmcDom.hs
@@ -17,7 +17,7 @@ import Data.List.Split
 import Data.Vector ((!), length)
 import qualified Data.Vector as V (singleton)
 import Data.Map (Map, unionWith, foldrWithKey)
-import qualified Data.Map as M (singleton, empty)
+import qualified Data.Map as M (singleton, empty, insert, insertWith)
 import qualified Data.HashMap.Strict as H (lookup)
 import Data.Aeson
 import Data.Aeson.Types
@@ -74,7 +74,25 @@ makeSubmap :: Object -> Parser (Maybe (Map String NmcDom))
 makeSubmap o = ((.).(.)) merge merge <$> takeTls o <*> takeSrv o <*> takeMap o
 
 takeMap :: Object -> Parser (Maybe (Map String NmcDom))
-takeMap o = o .:? "map"
+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
+      return result
+        where
+          splitup :: Map String NmcDom -> Map String NmcDom
+          splitup x = foldrWithKey stow M.empty x
+          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?
+              nest ([k], v)  = (k, v)
+              nest (k:ks, v) =
+                nest (ks, def { domSubmap = Just (M.singleton k v) })
+    _                -> empty
 
 takeSrv :: Object -> Parser (Maybe (Map String NmcDom))
 takeSrv o =