Add xmlutils for quick load simple xml files.

Also add test for xmlutils.

5 files changed, 174 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index baa1cf783..6c9d82731 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -587,6 +587,8 @@ SET(SRCS
     utils/mkdir.h
     utils/xml.cpp
     utils/xml.h
+    utils/xmlutils.cpp
+    utils/xmlutils.h
     test/testlauncher.cpp
     test/testlauncher.h
     test/testmain.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index bf29e7d03..e45a5397a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -118,6 +118,8 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
 	      utils/timer.h \
 	      utils/xml.cpp \
 	      utils/xml.h \
+	      utils/xmlutils.cpp \
+	      utils/xmlutils.h \
 	      utils/translation/podict.cpp \
 	      utils/translation/podict.h
 
@@ -686,6 +688,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      utils/mutex.h \
 	      utils/xml.cpp \
 	      utils/xml.h \
+	      utils/xmlutils.cpp \
+	      utils/xmlutils.h \
 	      test/testlauncher.cpp \
 	      test/testlauncher.h \
 	      test/testmain.cpp \
@@ -1033,6 +1037,7 @@ manaplus_SOURCES += \
 	      gui/widgets/browserbox_unittest.cc \
 	      utils/files_unittest.cc \
 	      utils/stringutils_unittest.cc \
+	      utils/xmlutils_unittest.cc \
 	      resources/dye_unittest.cc
 endif
 
diff --git a/src/utils/xmlutils.cpp b/src/utils/xmlutils.cpp
new file mode 100644
index 000000000..7d19b1064
--- /dev/null
+++ b/src/utils/xmlutils.cpp
@@ -0,0 +1,63 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/xmlutils.h"
+
+#include "logger.h"
+
+#include "utils/xml.h"
+
+#include "debug.h"
+
+void readXmlIntVector(const std::string &fileName,
+                      const std::string &rootName,
+                      const std::string &sectionName,
+                      const std::string &itemName,
+                      const std::string &attributeName,
+                      std::vector<int> &arr)
+{
+    arr.clear();
+    XML::Document doc(fileName);
+    const XmlNodePtrConst rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlNameEqual(rootNode, rootName.c_str()))
+    {
+        logger->log("Error while loading %s!", fileName.c_str());
+        return;
+    }
+
+    for_each_xml_child_node(sectionNode, rootNode)
+    {
+        if (!xmlNameEqual(sectionNode, sectionName.c_str()))
+            continue;
+        for_each_xml_child_node(childNode, sectionNode)
+        {
+            if (!xmlNameEqual(childNode, itemName.c_str()))
+                continue;
+
+            const int val = XML::getProperty(childNode,
+                attributeName.c_str(), -1);
+            if (val == -1)
+                continue;
+
+            arr.push_back(val);
+        }
+    }
+}
diff --git a/src/utils/xmlutils.h b/src/utils/xmlutils.h
new file mode 100644
index 000000000..3dbee5f95
--- /dev/null
+++ b/src/utils/xmlutils.h
@@ -0,0 +1,34 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UTILS_XMLUTILS_H
+#define UTILS_XMLUTILS_H
+
+#include <string>
+#include <vector>
+
+void readXmlIntVector(const std::string &fileName,
+                      const std::string &rootName,
+                      const std::string &sectionName,
+                      const std::string &itemName,
+                      const std::string &attributeName,
+                      std::vector<int> &arr);
+
+#endif  // UTILS_XMLUTILS_H
diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc
new file mode 100644
index 000000000..5b3469805
--- /dev/null
+++ b/src/utils/xmlutils_unittest.cc
@@ -0,0 +1,70 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/xmlutils.h"
+
+#include "client.h"
+#include "logger.h"
+
+#include "gtest/gtest.h"
+
+#include "utils/physfstools.h"
+#include "utils/xml.h"
+
+#include "resources/resourcemanager.h"
+
+#include <string>
+#include <vector>
+
+#include "debug.h"
+
+static void init()
+{
+    PHYSFS_init("manaplus");
+    dirSeparator = "/";
+    XML::initXML();
+    logger = new Logger();
+    ResourceManager *resman = ResourceManager::getInstance();
+    resman->addToSearchPath("data", false);
+    resman->addToSearchPath("../data", false);
+}
+
+TEST(xmlutils, readXmlIntVector1)
+{
+    Client::Options options;
+    client = new Client(options);
+    init();
+
+    std::vector<int> arr;
+
+    readXmlIntVector("graphics/gui/browserbox.xml",
+        "skinset",
+        "widget",
+        "option",
+        "value",
+        arr);
+
+    EXPECT_EQ(5, arr.size());
+    EXPECT_EQ(1, arr[0]);
+    EXPECT_EQ(15, arr[1]);
+    EXPECT_EQ(0, arr[2]);
+    EXPECT_EQ(1, arr[3]);
+    EXPECT_EQ(1, arr[4]);
+}