X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcTransform.hs;h=de6fc0f3e82172475c5b722968199e9ad5cb81c3;hp=dc5f0ff1e7663ef444fad55d4829f59173b61999;hb=ec5b2bb09f7098c1a22ef0c70dd69c2fec55ddef;hpb=1f0961535a0b6cdadb01c9896c391704f6ff8a74

diff --git a/NmcTransform.hs b/NmcTransform.hs
index dc5f0ff..de6fc0f 100644
--- a/NmcTransform.hs
+++ b/NmcTransform.hs
@@ -25,31 +25,34 @@ queryNmcDom queryOp key = do
       Nothing  -> return $ Left $ "Unparseable value: " ++ (show str)
       Just dom -> return $ Right dom
 
--- | Try to fetch "import" object and merge it into the base domain
---   Original "import" element is removed, but new imports from the
---   imported objects are processed recursively until there are none.
-mergeImport ::
+-- | Try to fetch "delegate" or "import" object and merge them into the
+--   base domain. Original "import" element is removed, but newly
+--   merged data may contain new "import" or "delegate", so the objects
+--   that are about to be merged are processed recursively until there
+--   are no more "import" and "deletage" attributes (or the depth gauge
+--   reaches zero).
+mergeIncl ::
   (String -> IO (Either String ByteString)) -- ^ query operation action
   -> Int                                    -- ^ recursion counter
   -> NmcDom                                 -- ^ base domain
   -> IO (Either String NmcDom)              -- ^ result with merged import
-mergeImport queryOp depth base = do
+mergeIncl queryOp depth base = do
   let
     mbase = (expandSrv . splitSubdoms . mergeSelf) base
-    base' = mbase {domImport = Nothing}
+    base' = mbase {domDelegate = Nothing, domImport = Nothing}
   -- print base
   if depth <= 0 then return $ Left "Nesting of imports is too deep"
-  else case domImport mbase of
-    Nothing  -> return $ Right base'
-    Just keys -> foldM mergeImport1 (Right base') keys
-      where
-        mergeImport1 (Left  err) _   = return $ Left err
-        mergeImport1 (Right acc) key = do
-          sub <- queryNmcDom queryOp key
-          case sub of
-            Left  err  -> return $ Left err
-            Right sub' -> mergeImport queryOp (depth - 1) $
-                                sub' `mergeNmcDom` acc
+  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
+      sub <- queryNmcDom queryOp key
+      case sub of
+        Left  err  -> return $ Left err
+        Right sub' -> mergeIncl queryOp (depth - 1) $ sub' `mergeNmcDom` acc
 
 -- | If there is an element in the map with key "", merge the contents
 --   and remove this element. Do this recursively.
@@ -88,7 +91,7 @@ expandSrv base =
               sub3 = emptyNmcDom { domSrv = Just [srvStr] }
               proto = "_" ++ (srvProto sr)
               srvid = "_" ++ (srvName sr)
-              srvStr =  (show (srvPrio sr)) ++ " "
+              srvStr =  (show (srvPrio sr)) ++ "\t"
                      ++ (show (srvWeight sr)) ++ " "
                      ++ (show (srvPort sr)) ++ " "
                      ++ (srvHost sr)
@@ -96,7 +99,7 @@ expandSrv base =
                 if srvName sr == "smtp"
                    && srvProto sr == "tcp"
                    && srvPort sr == 25
-                then Just [(show (srvPrio sr)) ++ " " ++ (srvHost sr)]
+                then Just [(show (srvPrio sr)) ++ "\t" ++ (srvHost sr)]
                 else Nothing
 
 -- | Convert map elements of the form "subN...sub2.sub1.dom.bit"
@@ -140,7 +143,7 @@ descendNmcDom ::
   -> NmcDom                                 -- ^ base domain
   -> IO (Either String NmcDom)              -- ^ fully processed result
 descendNmcDom queryOp subdom base = do
-  base' <- mergeImport queryOp 10 base
+  base' <- mergeIncl queryOp 10 base
   case subdom of
     []   -> return $ fmap normalizeDom base'
     d:ds ->