WebSVN – tpanel – Diff – /trunk/tpagelist.cpp

  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 #include <string>
 #include "tpagelist.h"
-#include "treadxml.h"
+#include "texpat++.h"
 #include "tconfig.h"
 #include "terror.h"
 using std::string;
 using std::vector;
+using namespace Expat;
 TPageList::TPageList()
+{
     DECL_TRACER("TPageList::TPageList()");
     mProject = makeFileName(TConfig::getProjectPath(), "prj.xma");
         TError::setErrorMsg("Empty or invalid project file! <" + mProject + ">");
         MSG_ERROR(TError::getErrorMsg());
         return;
+    }
-    TReadXML reader(mProject);
+    TExpat xml(mProject);
+    xml.setEncoding(ENC_CP1250);
-    if (TError::isError())
+    if (!xml.parse())
-    {
-        MSG_DEBUG("Stopped scanning the page list due to previous errors!");
         return;
-    }
-    string value = reader.findElement("pageList", "type");
+    int depth = 0;
-    string attribute = reader.getAttribute();
+    size_t index = 0;
-    if (attribute.empty())
-    {
-        TError::setErrorMsg("Missing element \"pageList\" in file " + mProject);
+    if ((index = xml.getElementIndex("pageList", &depth)) == TExpat::npos)
-        MSG_ERROR(TError::getErrorMsg());
-        return;
-    }
-    else if (attribute.compare("page") != 0 && attribute.compare("subpage") != 0)
+    {
-        TError::setErrorMsg("Invalid page type " + attribute + " found!");
+        MSG_ERROR("Couldn't find the section \"pageList\" in file!");
-        MSG_ERROR(TError::getErrorMsg());
+        TError::setError();
         return;
+    }
-    while (!attribute.empty())
+    do
+    {
-        mxml_node_t *nodeFirst = reader.getFirstChild();
+        vector<ATTRIBUTE_t> attrs = xml.getAttributes();
+        string attribute = xml.getAttribute("type", attrs);
+        if (attribute.empty())
+        {
+            TError::setErrorMsg("Missing element \"pageList\" in file " + mProject);
+            MSG_ERROR(TError::getErrorMsg());
+            return;
+        }
+        else if (attribute.compare("page") != 0 && attribute.compare("subpage") != 0)
+        {
+            TError::setErrorMsg("Invalid page type " + attribute + " found!");
+            MSG_ERROR(TError::getErrorMsg());
-        mxml_node_t *n = nodeFirst;
+            return;
+        }
-        while (n)
+        while ((index = xml.getNextElementIndex("pageEntry", depth+1)) != TExpat::npos)
+        {
-            mxml_node_t *item = reader.getFirstChild(n);
             PAGELIST_T pl;
             SUBPAGELIST_T spl;
             pl.clear();
             spl.clear();
+            string e, content;
-            while (item)
+            while ((index = xml.getNextElementFromIndex(index, &e, &content, nullptr)) != TExpat::npos)
+            {
-                string e = reader.getElementName(item);
                 if (attribute.compare("page") == 0)
+                {
                     if (e.compare("name") == 0)
-                        pl.name = reader.getTextFromNode(item);
+                        pl.name = content;
                     else if (e.compare("pageID") == 0)
-                        pl.pageID = reader.getIntFromNode(item);
+                        pl.pageID = xml.convertElementToInt(content);
                     else if (e.compare("file") == 0)
-                        pl.file = reader.getTextFromNode(item);
+                        pl.file = content;
                     else if (e.compare("isValid") == 0)
-                        pl.isValid = reader.getIntFromNode(item);
+                        pl.isValid = xml.convertElementToInt(content);
+                }
                 else if (attribute.compare("subpage") == 0)
+                {
                     if (e.compare("name") == 0)
-                        spl.name = reader.getTextFromNode(item);
+                        spl.name = content;
                     else if (e.compare("pageID") == 0)
-                        spl.pageID = reader.getIntFromNode(item);
+                        spl.pageID = xml.convertElementToInt(content);
                     else if (e.compare("file") == 0)
-                        spl.file = reader.getTextFromNode(item);
+                        spl.file = content;
                     else if (e.compare("group") == 0)
-                        spl.group = reader.getTextFromNode(item);
+                        spl.group = content;
                     else if (e.compare("isValid") == 0)
-                        spl.isValid = reader.getIntFromNode(item);
+                        spl.isValid = xml.convertElementToInt(content);
                     else if (e.compare("popupType") == 0)
-                        spl.popupType = reader.getIntFromNode(item);
+                        spl.popupType = xml.convertElementToInt(content);
+                }
-                item = reader.getNextChild(item);
+            }
             if (attribute.compare("page") == 0)
+            {
                 MSG_TRACE("Added page " << pl.pageID << ", " << pl.name << " to page list.");
             else if (attribute.compare("subpage") == 0)
+            {
                 MSG_TRACE("Added subpage " << spl.pageID << ", " << spl.name << " to subpage list.");
                 mSubPageList.push_back(spl);
+            }
-            n = reader.getNextChild();
+        }
-        value = reader.findNextElement("pageList", "type");
-        if (reader.success())
+        attribute.clear();
-            attribute = reader.getAttribute();
-        else
-            attribute.clear();
+        attrs.clear();
+    }
+    while ((index = xml.getNextElementIndex("pageList", depth)) != TExpat::npos);
+}
 PAGELIST_T TPageList::findPage(const std::string& name)
+{
     DECL_TRACER("TPageList::findPage(const std::string& name)");

Subversion Repositories tpanel

(root)/trunk/tpagelist.cpp @ 110 – Rev 65 → 78