cleanup main

diff --git a/NmcDom.hs b/NmcDom.hs
index 9edb79879f0e5cb3f469a27d95ee29ae5563106e..61f7a19642a4199a25f9f6a708e501d7bf05bb09 100644 (file)
--- a/NmcDom.hs
+++ b/NmcDom.hs
@@ -174,20 +174,19 @@ queryNmcDom queryOp key = do
       Just dom -> return $ Right dom
 
 -- | Try to fetch "import" object and merge it into the base domain
---   In case of errors they are ignored, and nothing is merged.
 --   Original "import" element is removed, but new imports from the
 --   imported objects are processed recursively until there are none.
 mergeImport ::
   (String -> IO (Either String ByteString)) -- ^ query operation action
   -> NmcDom                                 -- ^ base domain
-  -> IO NmcDom                              -- ^ result with merged import
+  -> IO (Either String NmcDom)              -- ^ result with merged import
 mergeImport queryOp base = do
   let base' = base {domImport = Nothing}
   -- print base'
   case domImport base of
-    Nothing  -> return base'
+    Nothing  -> return $ Right base'
     Just key -> do
       sub <- queryNmcDom queryOp key
       case sub of
-        Left  e    -> return base'
+        Left  e    -> return $ Left e
         Right sub' -> mergeImport queryOp $ sub' `mergeNmcDom` base'

diff --git a/pdns-pipe-nmc.hs b/pdns-pipe-nmc.hs
index d9ced8f3318629029611f1f5aff08e998dfebb73..0e0d9e6c017f1123b748af3bb774527472f0bb9a 100644 (file)
--- a/pdns-pipe-nmc.hs
+++ b/pdns-pipe-nmc.hs
@@ -4,9 +4,10 @@ module Main where
 
 import System.IO
 import Control.Monad
-import qualified Data.ByteString.Char8 as C (pack, unpack)
-import qualified Data.ByteString.Lazy.Char8 as L (pack, unpack)
-import Data.ByteString.Lazy as BS hiding (reverse, putStr, putStrLn)
+import Data.ByteString.Lazy hiding (reverse, putStr, putStrLn)
+import qualified Data.ByteString.Char8 as C (pack)
+import qualified Data.ByteString.Lazy.Char8 as L (pack)
+import qualified Data.Text as T (pack)
 import Data.List.Split
 import Data.Aeson (encode, decode, Value(..))
 import Network.HTTP.Types
@@ -23,7 +24,7 @@ confFile = "/etc/namecoin.conf"
 
 -- HTTP/JsonRpc interface
 
-qReq :: Config -> ByteString -> ByteString -> Request m
+qReq :: Config -> String -> String -> Request m
 qReq cf q id = applyBasicAuth (C.pack (rpcuser cf)) (C.pack (rpcpassword cf))
              $ def { host           = (C.pack (rpchost cf))
                    , port           = (rpcport cf)
@@ -35,8 +36,8 @@ qReq cf q id = applyBasicAuth (C.pack (rpcuser cf)) (C.pack (rpcpassword cf))
                    , requestBody    = RequestBodyLBS $ encode $
                                       JsonRpcRequest JsonRpcV1
                                                      "name_show"
-                                                     [q]
-                                                     (String "pdns-nmc")
+                                                     [L.pack q]
+                                                     (String (T.pack id))
                    , checkStatus    = \_ _ _ -> Nothing
                    }
 
@@ -51,23 +52,23 @@ qRsp rsp =
 
 -- NMC interface
 
-queryOp :: Manager -> Config -> String -> String
-        -> IO (Either String ByteString)
-queryOp mgr cfg qid key = do
-  rsp <- runResourceT $
-    httpLbs (qReq cfg (L.pack key) (L.pack qid)) mgr
-  return $ qRsp rsp
-
 queryNmc :: Manager -> Config -> String -> String
          -> IO (Either String NmcDom)
-queryNmc mgr cfg fqdn qid = do
+queryNmc mgr cfg qid fqdn =
   case reverse (splitOn "." fqdn) of
     "bit":dn:xs -> do
-      dom <- mergeImport (queryOp mgr cfg qid) $
+      dom <- mergeImport queryOp $
                 emptyNmcDom { domImport = Just ("d/" ++ dn)}
-      return $ Right $ descendNmcDom xs dom
+      case dom of
+        Left  err  -> return $ Left err
+        Right dom' -> return $ Right $ descendNmcDom xs dom'
     _           ->
       return $ Left "Only \".bit\" domain is supported"
+  where
+    queryOp key = do
+      rsp <- runResourceT $ httpLbs (qReq cfg key qid) mgr
+      -- print $ qRsp rsp
+      return $ qRsp rsp
 
 -- Main entry
 
@@ -101,7 +102,7 @@ main = do
       Right preq -> do
         case preq of
           PdnsRequestQ qname qtype id _ _ _ ->
-            queryNmc mgr cfg qname id >>= putStr . (pdnsOut ver id qname qtype)
+            queryNmc mgr cfg id qname >>= putStr . (pdnsOut ver id qname qtype)
           PdnsRequestAXFR xfrreq ->
             putStr $ pdnsReport ("No support for AXFR " ++ xfrreq)
           PdnsRequestPing -> putStrLn "END"
@@ -111,4 +112,4 @@ main = do
 ask str = do
   cfg <- readConfig confFile
   mgr <- newManager def
-  queryNmc mgr cfg str "askid" >>= putStr . (pdnsOut 1 "askid" str RRTypeANY)
+  queryNmc mgr cfg "askid" str >>= putStr . (pdnsOut 1 "askid" str RRTypeANY)