NestingXML experiment

1 files changed, 9 insertions, 4 deletions

diff --git a/Presence/NestingXML.hs b/Presence/NestingXML.hs
index cf4fcd93..b90d0caa 100644
--- a/Presence/NestingXML.hs
+++ b/Presence/NestingXML.hs
@@ -3,6 +3,7 @@ module NestingXML where
 import Data.Conduit
 import Data.XML.Types
 import Control.Monad.Reader
+-- import qualified Text.XML.Stream.Parse as Parse (content)
 
 type NestingXML o m a = ReaderT Int (ConduitM Event o m) a
 
@@ -36,18 +37,21 @@ maybeXML whenNothing withJust = do
     xml <- awaitXML
     maybe whenNothing withJust xml
 
-awaitCloser :: Monad m => Int -> NestingXML o m ()
+awaitCloser :: MonadIO m => Int -> NestingXML o m ()
 awaitCloser lvl = do
     fix $ \loop -> do
-        awaitXML
         lvl' <- nesting
-        when (lvl' >= lvl) loop
+        when (lvl' >= lvl) $ do
+        withXML $ \xml -> do
+            liftIO $ putStrLn $ "awaitCloser: "++show (lvl',lvl,xml)
+            loop
 
-nextElement :: Monad m => NestingXML o m (Maybe Event)
+nextElement :: MonadIO m => NestingXML o m (Maybe Event)
 nextElement = do
     lvl <- nesting
     fix $ \loop  -> do
         xml <- awaitXML
+        liftIO $ putStrLn $ "nextElement: "++show xml
         case xml of
             Nothing                      -> return Nothing
             Just (EventBeginElement _ _) -> return xml
@@ -55,3 +59,4 @@ nextElement = do
                 lvl' <- nesting
                 if (lvl'>=lvl) then loop 
                                else return Nothing
+