update makefile for version roll

[asdcplib.git] / src / KM_xml.h

diff --git a/src/KM_xml.h b/src/KM_xml.h
index 6900dd8f6d29afd9f297b551918c201a9227ba0c..0c84e563c17035f098c4f96dc6b5a6896e83c187 100644 (file)
--- a/src/KM_xml.h
+++ b/src/KM_xml.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2005-2006, John Hurst
+Copyright (c) 2005-2015, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -41,9 +41,6 @@ namespace Kumu
 {
   class XMLElement;
 
-  // Return true if the given string contains an XML document (or the start of one).
-  bool StringIsXML(const char* document, ui32_t len = 0);
-
   //
   struct NVPair
   {
@@ -57,6 +54,15 @@ namespace Kumu
   typedef std::list<XMLElement*> ElementList;
   typedef ElementList::const_iterator Elem_i;
 
+  bool GetXMLDocType(const ByteString& buf, std::string& ns_prefix, std::string& type_name,
+                    std::string& namespace_name, AttributeList& doc_attr_list);
+
+  bool GetXMLDocType(const std::string& buf, std::string& ns_prefix, std::string& type_name,
+                    std::string& namespace_name, AttributeList& doc_attr_list);
+
+  bool GetXMLDocType(const byte_t* buf, ui32_t buf_len, std::string& ns_prefix, std::string& type_name,
+                    std::string& namespace_name, AttributeList& doc_attr_list);
+
   //
   class XMLNamespace
   {
@@ -77,6 +83,10 @@ namespace Kumu
   //
   class XMLElement
     {
+      KM_NO_COPY_CONSTRUCT(XMLElement);
+      XMLElement();
+
+    protected:
       AttributeList       m_AttrList;
       ElementList         m_ChildList;
       const XMLNamespace* m_Namespace;
@@ -85,9 +95,6 @@ namespace Kumu
       std::string   m_Name;
       std::string   m_Body;
 
-      KM_NO_COPY_CONSTRUCT(XMLElement);
-      XMLElement();
-
     public:
       XMLElement(const char* name);
       ~XMLElement();
@@ -95,27 +102,46 @@ namespace Kumu
       inline const XMLNamespace* Namespace() const { return m_Namespace; }
       inline void                SetNamespace(const XMLNamespace* ns) { assert(ns); m_Namespace = ns; }
 
+      bool        ParseString(const char* document, ui32_t doc_len);
+      bool        ParseString(const ByteString& document);
       bool        ParseString(const std::string& document);
 
+      bool        ParseFirstFromString(const char* document, ui32_t doc_len);
+      bool        ParseFirstFromString(const ByteString& document);
+      bool        ParseFirstFromString(const std::string& document);
+
       // building
       void        SetName(const char* name);
+      void        SetBody(const std::string& value);
       void        AppendBody(const std::string& value);
       void        SetAttr(const char* name, const char* value);
+      void        SetAttr(const char* name, const std::string& value) { SetAttr(name, value.c_str()); }
+      XMLElement* AddChild(XMLElement* element);
       XMLElement* AddChild(const char* name);
       XMLElement* AddChildWithContent(const char* name, const char* value);
       XMLElement* AddChildWithContent(const char* name, const std::string& value);
       XMLElement* AddChildWithPrefixedContent(const char* name, const char* prefix, const char* value);
       void        AddComment(const char* value);
-      void        Render(std::string&) const;
-      void        RenderElement(std::string& outbuf, ui32_t depth) const;
+      void        Render(std::string& str) const { Render(str, true); }
+      void        Render(std::string&, const bool& pretty) const;
+      void        RenderElement(std::string& outbuf, const ui32_t& depth, const bool& pretty) const;
 
       // querying
-      inline const std::string& GetBody() const { return m_Body; }
-      const char*    GetAttrWithName(const char* name) const;
-      XMLElement*    GetChildWithName(const char* name) const;
+      inline const std::string&   GetBody() const { return m_Body; }
+      inline const ElementList&   GetChildren() const { return m_ChildList; }
+      inline const std::string&   GetName() const { return m_Name; }
+      inline const AttributeList& GetAttributes() const { return m_AttrList; }
+      const char*        GetAttrWithName(const char* name) const;
+      XMLElement*        GetChildWithName(const char* name) const;
       const ElementList& GetChildrenWithName(const char* name, ElementList& outList) const;
-      bool           HasName(const char* name) const;
-
+      bool               HasName(const char* name) const;
+
+      // altering
+      void        DeleteAttributes();
+      void        DeleteAttrWithName(const char* name);
+      void        DeleteChildren();
+      void        DeleteChild(const XMLElement* element);
+      void        ForgetChild(const XMLElement* element);
     };
 } // namespace Kumu