Updated hipporestrequest code to hippo 0.6.3

6 files changed, 143 insertions, 11 deletions

diff --git a/linden/indra/llxml/llxmlnode.cpp b/linden/indra/llxml/llxmlnode.cpp
index 800b135..5bb5012 100644
--- a/linden/indra/llxml/llxmlnode.cpp
+++ b/linden/indra/llxml/llxmlnode.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2009, Linden Research, Inc.
+ * Copyright (c) 2005-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -677,7 +677,7 @@ bool LLXMLNode::parseFile(const std::string& filename, LLXMLNodePtr& node, LLXML
         U32 length = ftell(fp);
         fseek(fp, 0, SEEK_SET);
 
-        U8* buffer = new U8[length+1];
+        char *buffer = new char[length+1];
         size_t nread = fread(buffer, 1, length, fp);
         buffer[nread] = 0;
         fclose(fp);
@@ -689,7 +689,7 @@ bool LLXMLNode::parseFile(const std::string& filename, LLXMLNodePtr& node, LLXML
 
 // static
 bool LLXMLNode::parseBuffer(
-        U8* buffer,
+        const char *buffer,
         U32 length,
         LLXMLNodePtr& node, 
         LLXMLNode* defaults)
@@ -708,7 +708,7 @@ bool LLXMLNode::parseBuffer(
         XML_SetUserData(my_parser, (void *)file_node_ptr);
 
         // Do the parsing
-        if (XML_Parse(my_parser, (const char *)buffer, length, TRUE) != XML_STATUS_OK)
+        if (XML_Parse(my_parser, buffer, length, TRUE) != XML_STATUS_OK)
         {
                 llwarns << "Error parsing xml error code: "
                                 << XML_ErrorString(XML_GetErrorCode(my_parser))
diff --git a/linden/indra/llxml/llxmlnode.h b/linden/indra/llxml/llxmlnode.h
index d4e127b..ab1a772 100644
--- a/linden/indra/llxml/llxmlnode.h
+++ b/linden/indra/llxml/llxmlnode.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2009, Linden Research, Inc.
+ * Copyright (c) 2000-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -141,7 +141,7 @@ public:
                 LLXMLNodePtr& node, 
                 LLXMLNode* defaults_tree);
         static bool parseBuffer(
-                U8* buffer,
+                const char *buffer,
                 U32 length,
                 LLXMLNodePtr& node, 
                 LLXMLNode* defaults);
diff --git a/linden/indra/llxml/llxmlparser.cpp b/linden/indra/llxml/llxmlparser.cpp
index 7d887f4..7304730 100644
--- a/linden/indra/llxml/llxmlparser.cpp
+++ b/linden/indra/llxml/llxmlparser.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2009, Linden Research, Inc.
+ * Copyright (c) 2002-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llxml/llxmlparser.h b/linden/indra/llxml/llxmlparser.h
index d7595f6..9e7d256 100644
--- a/linden/indra/llxml/llxmlparser.h
+++ b/linden/indra/llxml/llxmlparser.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2009, Linden Research, Inc.
+ * Copyright (c) 2002-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llxml/llxmltree.cpp b/linden/indra/llxml/llxmltree.cpp
index 1bce5d2..aa34f79 100644
--- a/linden/indra/llxml/llxmltree.cpp
+++ b/linden/indra/llxml/llxmltree.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2009, Linden Research, Inc.
+ * Copyright (c) 2002-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -50,6 +50,7 @@ LLStdStringTable LLXmlTree::sAttributeKeys(1024);
 
 LLXmlTree::LLXmlTree()
         : mRoot( NULL ),
+          mParser(0),
           mNodeNames(512)
 {
 }
@@ -83,6 +84,39 @@ BOOL LLXmlTree::parseFile(const std::string &path, BOOL keep_contents)
         return success;
 }
 
+bool LLXmlTree::parseBufferStart(bool keep_contents)
+{
+        if (mRoot) delete mRoot;
+        mRoot = NULL;
+
+        if (mParser) delete mParser;
+        mParser = new LLXmlTreeParser(this);
+        mParser->parseBufferStart(keep_contents);
+        return (mParser != 0);
+}
+
+bool LLXmlTree::parseBuffer(const char *buf, int len)
+{
+        bool success = mParser->parseBuffer(buf, len);
+        if (!success) {
+                S32 line_number = mParser->getCurrentLineNumber();
+                const char* error = mParser->getErrorString();
+                llwarns << "LLXmlTree parse failed in line " << line_number << ": " << error << llendl;
+                delete mParser;
+                mParser = 0;
+        }
+        return success;
+}
+
+bool LLXmlTree::parseBufferFinalize()
+{
+        bool success = mParser->parseBufferFinalize(&mRoot);
+        delete mParser;
+        mParser = 0;
+        return success;
+}
+
+
 void LLXmlTree::dump()
 {
         if( mRoot )
@@ -102,6 +136,25 @@ void LLXmlTree::dumpNode( LLXmlTreeNode* node, const std::string& prefix )
         }
 }
 
+void LLXmlTree::write(std::string &buffer) const
+{
+        if (mRoot) writeNode(mRoot, buffer, "");
+}
+
+void LLXmlTree::writeNode(LLXmlTreeNode *node, std::string &buffer, const std::string &indent) const
+{
+        if (!node->getFirstChild()) {
+                node->writeNoChild(buffer, indent);
+        } else {
+                node->writeStart(buffer, indent);
+                std::string newIndent = indent + "      ";
+                for (LLXmlTreeNode *child=node->getFirstChild(); child; child=node->getNextChild())
+                        writeNode(child, buffer, newIndent);
+                node->writeEnd(buffer, indent);
+        }
+}
+
+
 //////////////////////////////////////////////////////////////
 // LLXmlTreeNode
 
@@ -139,6 +192,43 @@ void LLXmlTreeNode::dump( const std::string& prefix )
         llcont << llendl;
 } 
 
+void LLXmlTreeNode::writeNoChild(std::string &buffer, const std::string &indent) const
+{
+        if (!mContents.empty()) {
+                writeStart(buffer, indent);
+                writeEnd(buffer, indent);
+        } else {
+                buffer += indent + '<' + mName;
+                writeAttributes(buffer);
+                buffer += "/>\n";
+        }
+}
+
+void LLXmlTreeNode::writeStart(std::string &buffer, const std::string &indent) const
+{
+        buffer += indent + '<' + mName;
+        writeAttributes(buffer);
+        buffer += ">\n";
+}
+
+void LLXmlTreeNode::writeEnd(std::string &buffer, const std::string &indent) const
+{
+        if (!mContents.empty()) {
+                buffer += indent + "  " + mContents + '\n';
+        }
+        buffer += indent + "</" + mName + ">\n";
+}
+
+void LLXmlTreeNode::writeAttributes(std::string &buffer) const
+{
+        attribute_map_t::const_iterator it, end = mAttributes.end();
+        for (it=mAttributes.begin(); it!=end; ++it) {
+                LLStdStringHandle key = it->first;
+                const std::string *value = it->second;
+                buffer += ' ' + *key + "=\"" + *value + '"';
+        }
+}
+
 BOOL LLXmlTreeNode::hasAttribute(const std::string& name)
 {
         LLStdStringHandle canonical_name = LLXmlTree::sAttributeKeys.addString( name );
@@ -527,7 +617,7 @@ BOOL LLXmlTreeParser::parseFile(const std::string &path, LLXmlTreeNode** root, B
 
         BOOL success = LLXmlParser::parseFile(path);
 
-        *root = mRoot;
+        if (root) *root = mRoot;
         mRoot = NULL;
 
         if( success )
@@ -539,6 +629,31 @@ BOOL LLXmlTreeParser::parseFile(const std::string &path, LLXmlTreeNode** root, B
         return success;
 }
 
+void LLXmlTreeParser::parseBufferStart(BOOL keep_contents)
+{
+        llassert(!mRoot);
+        llassert(!mCurrent);
+        mKeepContents = keep_contents;
+}
+
+bool LLXmlTreeParser::parseBuffer(const char *buf, int len)
+{
+        return (LLXmlParser::parse(buf, len, false) != 0);
+}
+
+bool LLXmlTreeParser::parseBufferFinalize(LLXmlTreeNode** root)
+{
+        bool success = (LLXmlParser::parse(0, 0, true) != 0);
+
+        if (root) *root = mRoot;
+        mRoot = NULL;
+
+        llassert(!success || !mCurrent);
+        mCurrent = NULL;
+
+        return success;
+}
+
 
 const std::string& LLXmlTreeParser::tabs()
 {
diff --git a/linden/indra/llxml/llxmltree.h b/linden/indra/llxml/llxmltree.h
index 1a020f2..31f89de 100644
--- a/linden/indra/llxml/llxmltree.h
+++ b/linden/indra/llxml/llxmltree.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2001-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -63,11 +63,18 @@ public:
 
         virtual BOOL    parseFile(const std::string &path, BOOL keep_contents = TRUE);
 
+        bool parseBufferStart(bool keep_contents = true);
+        bool parseBuffer(const char *buf, int len);
+        bool parseBufferFinalize();
+
         LLXmlTreeNode*  getRoot() { return mRoot; }
 
         void                    dump();
         void                    dumpNode( LLXmlTreeNode* node, const std::string& prefix );
 
+        void write(std::string &buffer) const;
+        void writeNode(LLXmlTreeNode *node, std::string &buffer, const std::string &indent) const;
+
         static LLStdStringHandle addAttributeString( const std::string& name)
         {
                 return sAttributeKeys.addString( name );
@@ -79,6 +86,7 @@ public:
         
 protected:
         LLXmlTreeNode* mRoot;
+        LLXmlTreeParser *mParser;
 
         // local
         LLStdStringTable mNodeNames;    
@@ -175,6 +183,11 @@ private:
 
         void                    dump( const std::string& prefix );
 
+        void writeNoChild(std::string &buffer, const std::string &indent) const;
+        void writeStart(std::string &buffer, const std::string &indent) const;
+        void writeEnd(std::string &buffer, const std::string &indent) const;
+        void writeAttributes(std::string &buffer) const;
+
 protected:
         typedef std::map<LLStdStringHandle, const std::string*> attribute_map_t;
         attribute_map_t                                         mAttributes;
@@ -207,6 +220,10 @@ public:
 
         BOOL parseFile(const std::string &path, LLXmlTreeNode** root, BOOL keep_contents );
 
+        void parseBufferStart(BOOL keep_contents);
+        bool parseBuffer(const char *buf, int len);
+        bool parseBufferFinalize(LLXmlTreeNode** root);
+
 protected:
         const std::string& tabs();