Changeset 32565 in vbox

Timestamp:

Sep 16, 2010 2:39:24 PM (14 years ago)

Author:

vboxsync

Message:

Runtime/Main: add xml/ovf parsing in memory

Location:

trunk

Files:

• include/iprt/cpp/xml.h (modified) (2 diffs)
• src/VBox/Main/include/ovfreader.h (modified) (2 diffs)
• src/VBox/Main/xml/ovfreader.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/xml.cpp (modified) (4 diffs)

trunk/include/iprt/cpp/xml.h

@@ -565 +565 @@
 
 private:
+    friend class XmlMemParser;
     friend class XmlFileParser;
     friend class XmlFileWriter;
@@ -587 +588 @@
 
     xmlParserCtxtPtr m_ctxt;
+};
+
+/*
+ * XmlMemParser
+ *
+ */
+
+class RT_DECL_CLASS XmlMemParser : public XmlParserBase
+{
+public:
+    XmlMemParser();
+    ~XmlMemParser();
+
+    void read(const void* pvBuf, int cbSize, const iprt::MiniString &strFilename, Document &doc);
 };
 

trunk/src/VBox/Main/include/ovfreader.h

@@ -403 +403 @@
 {
 public:
+    OVFReader(const void *pvBuf, int cbSize, const iprt::MiniString &path);
     OVFReader(const iprt::MiniString &path);
 
@@ -413 +414 @@
     xml::Document               m_doc;
 
+    void parse();
     void LoopThruSections(const xml::ElementNode *pReferencesElem, const xml::ElementNode *pCurElem);
     void HandleDiskSection(const xml::ElementNode *pReferencesElem, const xml::ElementNode *pSectionElem);

trunk/src/VBox/Main/xml/ovfreader.cpp

@@ -31 +31 @@
 
 /**
+ * Constructor. This parses the given XML file out of the memory. Throws lots of exceptions
+ * on XML or OVF invalidity.
+ * @param pvBuf  the memory buffer to parse
+ * @param cbSize the size of the memory buffer
+ * @param path   path to a filename for error messages.
+ */
+OVFReader::OVFReader(const void *pvBuf, int cbSize, const MiniString &path)
+    : m_strPath(path)
+{
+    xml::XmlMemParser parser;
+    parser.read(pvBuf, cbSize,
+                m_strPath,
+                m_doc);
+    /* Start the parsing */
+    parse();
+}
+
+/**
  * Constructor. This opens the given XML file and parses it. Throws lots of exceptions
  * on XML or OVF invalidity.
@@ -41 +59 @@
     parser.read(m_strPath,
                 m_doc);
-
+    /* Start the parsing */
+    parse();
+}
+
+void OVFReader::parse()
+{
     const xml::ElementNode *pRootElem = m_doc.getRootElement();
     if (    !pRootElem

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -1340 +1340 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
+// XmlMemParser class
+//
+////////////////////////////////////////////////////////////////////////////////
+
+XmlMemParser::XmlMemParser()
+    : XmlParserBase()
+{
+}
+
+XmlMemParser::~XmlMemParser()
+{
+}
+
+/**
+ * Parse the given buffer and fills the given Document object with its contents.
+ * Throws XmlError on parsing errors.
+ *
+ * The document that is passed in will be reset before being filled if not empty.
+ *
+ * @param pvBuf in: memory buffer to parse.
+ * @param cbSize in: size of the memory buffer.
+ * @param strFilename in: name fo file to parse.
+ * @param doc out: document to be reset and filled with data according to file contents.
+ */
+void XmlMemParser::read(const void* pvBuf, int cbSize,
+                        const iprt::MiniString &strFilename,
+                        Document &doc)
+{
+    GlobalLock lock;
+//     global.setExternalEntityLoader(ExternalEntityLoader);
+
+    const char *pcszFilename = strFilename.c_str();
+
+    doc.m->reset();
+    if (!(doc.m->plibDocument = xmlCtxtReadMemory(m_ctxt,
+                                                  (const char*)pvBuf,
+                                                  cbSize,
+                                                  pcszFilename,
+                                                  NULL,       // encoding = auto
+                                                  XML_PARSE_NOBLANKS)))
+        throw XmlError(xmlCtxtGetLastError(m_ctxt));
+
+    doc.refreshInternals();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
 // XmlFileParser class
 //
@@ -1346 +1393 @@
 struct XmlFileParser::Data
 {
-    xmlParserCtxtPtr ctxt;
     iprt::MiniString strXmlFilename;
 
     Data()
     {
-        if (!(ctxt = xmlNewParserCtxt()))
-            throw std::bad_alloc();
     }
 
     ~Data()
     {
-        xmlFreeParserCtxt(ctxt);
-        ctxt = NULL;
     }
 };
@@ -1431 +1473 @@
     ReadContext context(pcszFilename);
     doc.m->reset();
-    if (!(doc.m->plibDocument = xmlCtxtReadIO(m->ctxt,
+    if (!(doc.m->plibDocument = xmlCtxtReadIO(m_ctxt,
                                               ReadCallback,
                                               CloseCallback,
@@ -1438 +1480 @@
                                               NULL,       // encoding = auto
                                               XML_PARSE_NOBLANKS)))
-        throw XmlError(xmlCtxtGetLastError(m->ctxt));
+        throw XmlError(xmlCtxtGetLastError(m_ctxt));
 
     doc.refreshInternals();