From 2427a21428b6704a08119a24c60f0e77830c55c7 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Fri, 1 Dec 2017 19:44:07 +0000
Subject: [PATCH] minor serial IO fixes, XML now issues warning when trying to
 read absent nodes, these becomes

---
 lib/serialisation/JSON_IO.cc   |  2 +-
 lib/serialisation/MacroMagic.h |  6 ++++-
 lib/serialisation/XmlIO.cc     | 41 ++++++++++++++++++++++------------
 lib/serialisation/XmlIO.h      | 10 +++++++--
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/lib/serialisation/JSON_IO.cc b/lib/serialisation/JSON_IO.cc
index 99a9cdd6..6a01aa84 100644
--- a/lib/serialisation/JSON_IO.cc
+++ b/lib/serialisation/JSON_IO.cc
@@ -25,7 +25,7 @@
     See the full license in the file "LICENSE" in the top level distribution directory
     *************************************************************************************/
     /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>
 
 using namespace Grid;
 using namespace std;
diff --git a/lib/serialisation/MacroMagic.h b/lib/serialisation/MacroMagic.h
index 774c947f..5df2c780 100644
--- a/lib/serialisation/MacroMagic.h
+++ b/lib/serialisation/MacroMagic.h
@@ -125,7 +125,11 @@ static inline void write(Writer<T> &WR,const std::string &s, const cname &obj){
 }\
 template <typename T>\
 static inline void read(Reader<T> &RD,const std::string &s, cname &obj){	\
-  push(RD,s);\
+  if (!push(RD,s))\
+  {\
+    std::cout << Grid::GridLogWarning << "IO: Cannot open node '" << s << "'" << std::endl;\
+    return;\
+  };\
   GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_READ_MEMBER,__VA_ARGS__))	\
   pop(RD);\
 }\
diff --git a/lib/serialisation/XmlIO.cc b/lib/serialisation/XmlIO.cc
index 260611a5..8ac7422c 100644
--- a/lib/serialisation/XmlIO.cc
+++ b/lib/serialisation/XmlIO.cc
@@ -100,13 +100,16 @@ XmlReader::XmlReader(const string &fileName,string toplev) : fileName_(fileName)
 
 bool XmlReader::push(const string &s)
 {
+  if (node_.child(s.c_str()))
+  {
+    node_ = node_.child(s.c_str());
 
-  if (node_.child(s.c_str()) == NULL )
+    return true;
+  }
+  else
+  {
     return false;
-
-  node_ = node_.child(s.c_str());
-  return true;
-    
+  }
 }
 
 void XmlReader::pop(void)
@@ -117,20 +120,30 @@ void XmlReader::pop(void)
 bool XmlReader::nextElement(const std::string &s)
 {
   if (node_.next_sibling(s.c_str()))
-    {
-      node_ = node_.next_sibling(s.c_str());
-      
-      return true;
-    }
+  {
+    node_ = node_.next_sibling(s.c_str());
+    
+    return true;
+  }
   else
-    {
-      return false;
-    }
+  {
+    return false;
+  }
 
 }
 
 template <>
 void XmlReader::readDefault(const string &s, string &output)
 {
-  output = node_.child(s.c_str()).first_child().value();
+  if (node_.child(s.c_str()))
+  {
+    output = node_.child(s.c_str()).first_child().value();
+  }
+  else
+  {
+    std::cout << GridLogWarning << "XML: cannot open node '" << s << "'";
+    std::cout << std::endl;
+
+    output = ""; 
+  }
 }
diff --git a/lib/serialisation/XmlIO.h b/lib/serialisation/XmlIO.h
index fcdbf1e4..e37eb8d9 100644
--- a/lib/serialisation/XmlIO.h
+++ b/lib/serialisation/XmlIO.h
@@ -39,6 +39,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #include <cassert>
 
 #include <Grid/pugixml/pugixml.h>
+#include <Grid/GridCore.h>
 
 namespace Grid
 {
@@ -119,7 +120,6 @@ namespace Grid
     std::string buf;
     
     readDefault(s, buf);
-    //    std::cout << s << "   " << buf << std::endl;
     fromString(output, buf);
   }
   
@@ -132,7 +132,13 @@ namespace Grid
     std::string    buf;
     unsigned int   i = 0;
     
-    push(s);
+    if (!push(s))
+    {
+      std::cout << GridLogWarning << "XML: cannot open node '" << s << "'";
+      std::cout << std::endl;
+
+      return; 
+    }
     while (node_.child("elem"))
     {
       output.resize(i + 1);