X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcDom.hs;h=2fdd6b99a3b41df75dd71c210d23aa2e29992796;hp=bcbfcd39a3dd2c08463cb273df0e55304432932f;hb=851c71d42654a1620ea98d2dfe751d2e7fbc961f;hpb=e426dad1c624b87722fdde752258feaf92d103f2

diff --git a/NmcDom.hs b/NmcDom.hs
index bcbfcd3..2fdd6b9 100644
--- a/NmcDom.hs
+++ b/NmcDom.hs
@@ -9,7 +9,7 @@ module NmcDom   ( NmcDom(..)
                 ) where
 
 import Prelude hiding (length)
-import Control.Applicative ((<$>), (<*>), empty, pure)
+import Control.Applicative ((<$>), (<*>), liftA2, empty, pure)
 import Data.Char
 import Data.Text (Text, unpack)
 import Data.List (union)
@@ -17,8 +17,8 @@ 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.HashMap.Strict as H (lookup)
+import qualified Data.Map as M (singleton, empty, insert, insertWith)
+import qualified Data.HashMap.Strict as H (lookup, foldrWithKey)
 import Data.Aeson
 import Data.Aeson.Types
 import Data.Default.Class
@@ -71,10 +71,24 @@ makeMx o =
     Just _ -> empty
 
 makeSubmap :: Object -> Parser (Maybe (Map String NmcDom))
-makeSubmap o = ((.).(.)) merge merge <$> takeTls o <*> takeSrv o <*> takeMap o
+makeSubmap o = takeTls o `fmerge` takeSrv o `fmerge` takeMap o
+  where fmerge = liftA2 merge
 
 takeMap :: Object -> Parser (Maybe (Map String NmcDom))
-takeMap o = o .:? "map" -- FIXME split over dots here
+takeMap o =
+  case H.lookup "map" o of
+    Nothing          -> pure Nothing
+    Just (Object mo) -> H.foldrWithKey addmapentry (pure (Just M.empty)) mo
+      where
+        addmapentry "" v acc = parseJSON v >>= inject acc ""
+        addmapentry k  v acc = nest (splitOn "." (unpack k)) v acc
+        nest []     v acc = empty -- does not happen as a result of splitOn
+        nest [""]   v acc = empty -- empty element of fqdn forbidden
+        nest [d]    v acc = parseJSON v >>= inject acc d
+        nest (d:ds) v acc =
+          nest ds v acc >>= (inject acc d) . (\r -> def { domSubmap = r })
+        inject acc d r = (fmap.fmap) (M.insertWith merge d r) acc
+    _ -> empty
 
 takeSrv :: Object -> Parser (Maybe (Map String NmcDom))
 takeSrv o =