X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FConfig%2FConfig_XMLReader.h;h=119bd71c132542d662f3fb5b9f152207d4955fb1;hb=c6a92152ecb67e86489d0a17c8df5fa2e5bcf84e;hp=25637fd496e9bad70cb16c8f36fd36fa963074ff;hpb=24a99a1363325ac341314c3f2e18326841940fb7;p=modules%2Fshaper.git

diff --git a/src/Config/Config_XMLReader.h b/src/Config/Config_XMLReader.h
index 25637fd49..119bd71c1 100644
--- a/src/Config/Config_XMLReader.h
+++ b/src/Config/Config_XMLReader.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 /*
  * Config_XMLReader.h
  *
@@ -8,34 +10,55 @@
 #ifndef CONFIG_XMLREADER_H_
 #define CONFIG_XMLREADER_H_
 
-#include "Config.h"
-#include "Config_Message.h"
+#include <Config_def.h>
 
+#include <cstdarg>
 #include <string>
-#include <map>
-
-class CONFIG_EXPORT Config_XMLReader {
-public:
-  Config_XMLReader(const std::string& theXmlFile);
-  virtual ~Config_XMLReader();
-
-  std::string documentPath() const;
-  void setDocumentPath(std::string documentName);
-
-  void readAll();
-
-protected:
-  //! Performs the real import of the given xml file, return false if file is not found
-  //! or generates an algo error if file content is bad
-  //! \param theFile name of the imported XML file
-  //! \returns true if file exists and not corrupted
-  bool import();
-  bool importWorkbench(void*);
-  void fillFeature(void *theRoot, Config_FeatureMessage& outFeatureMessage);
-  std::string getProperty(void *theRoot, const char* name);
-
-private:
-  std::string m_DocumentPath;
+
+//>> Forward declaration of xmlNodePtr.
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+struct _xmlNode;
+//<<
+
+//>> Forward declaration of xmlDocPtr.
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
+struct _xmlDoc;
+//<<
+
+/*
+ * Base class for all libxml readers. Provides high-level API
+ * for all xml operations.
+ *
+ */
+class Config_XMLReader
+{
+ public:
+  CONFIG_EXPORT Config_XMLReader(const std::string& theXmlFile);CONFIG_EXPORT virtual ~Config_XMLReader();
+
+  CONFIG_EXPORT void readAll();
+
+ public:
+  CONFIG_EXPORT xmlNodePtr findRoot();
+
+ protected:
+  virtual void processNode(xmlNodePtr aNode);
+  virtual bool processChildren(xmlNodePtr aNode);
+
+  void readRecursively(xmlNodePtr theParent);
+
+  xmlNodePtr node(void* theNode);
+  std::string getNodeName(xmlNodePtr theNode);
+  void processValidator(xmlNodePtr theNode);
+  void processSelectionFilter(xmlNodePtr theNode);
+
+ protected:
+  std::string myCurrentFeature;
+
+ protected:
+  std::string myDocumentPath;
+  xmlDocPtr myXmlDoc;
 };
 
 #endif /* CONFIG_XMLREADER_H_ */