Spellbind it under Cabal

[pdns-pipe-nmc.git] / NmcTransform.hs

diff --git a/NmcTransform.hs b/NmcTransform.hs
index de6fc0f3e82172475c5b722968199e9ad5cb81c3..c30bc1f8efe525ffb3f2c8950b14476153449756 100644 (file)
--- a/NmcTransform.hs
+++ b/NmcTransform.hs
@@ -42,10 +42,10 @@ mergeIncl queryOp depth base = do
     base' = mbase {domDelegate = Nothing, domImport = Nothing}
   -- print base
   if depth <= 0 then return $ Left "Nesting of imports is too deep"
-  else case ((domDelegate mbase), (domImport mbase)) of
-    (Nothing,  Nothing  ) -> return $ Right base'
-    (Nothing,  Just keys) -> foldM mergeIncl1 (Right base') keys
-    (Just key, _        ) -> mergeIncl1 (Right emptyNmcDom) key
+    else case ((domDelegate mbase), (domImport mbase)) of
+      (Nothing,  Nothing  ) -> return $ Right base'
+      (Nothing,  Just keys) -> foldM mergeIncl1 (Right base') keys
+      (Just key, _        ) -> mergeIncl1 (Right emptyNmcDom) key
   where
     mergeIncl1 (Left  err) _   = return $ Left err -- can never happen
     mergeIncl1 (Right acc) key = do
@@ -117,7 +117,8 @@ splitSubdoms base =
           stow fqdn sdom acc = insertWith mergeNmcDom fqdn' sdom' acc
             where
               (fqdn', sdom') =
-                nest (map unpack (splitOn (pack ".") (pack fqdn)), sdom)
+                nest (filter (/= "") (splitOnDots fqdn), sdom)
+              splitOnDots s = map unpack (splitOn (pack ".") (pack s))
               nest ([], v)   = (fqdn, v) -- can split result be empty?
               nest ([k], v)  = (k, v)
               nest (k:ks, v) =