summaryrefslogtreecommitdiff
path: root/src/resources/db/deaddb.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-12 00:18:57 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-12 00:51:22 +0300
commitd5a00a320043f5782ebc489285c89943b667e094 (patch)
treeeb64f3b1f81f7ba2a3c7ff9e02ad329ef21abb83 /src/resources/db/deaddb.cpp
parent742b2a22bdcb69e6f615a284065ba2696e7bc261 (diff)
downloadplus-d5a00a320043f5782ebc489285c89943b667e094.tar.gz
plus-d5a00a320043f5782ebc489285c89943b667e094.tar.bz2
plus-d5a00a320043f5782ebc489285c89943b667e094.tar.xz
plus-d5a00a320043f5782ebc489285c89943b667e094.zip
Add skipError parameter to loadXml functions.
This allow not show errors for some not main xml files.
Diffstat (limited to 'src/resources/db/deaddb.cpp')
-rw-r--r--src/resources/db/deaddb.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/resources/db/deaddb.cpp b/src/resources/db/deaddb.cpp
index a2a6a6494..fe336b215 100644
--- a/src/resources/db/deaddb.cpp
+++ b/src/resources/db/deaddb.cpp
@@ -40,17 +40,18 @@ void DeadDB::load()
if (mLoaded)
unload();
- loadXmlFile(paths.getStringValue("deadMessagesFile"));
- loadXmlFile(paths.getStringValue("deadMessagesPatchFile"));
+ loadXmlFile(paths.getStringValue("deadMessagesFile"), SkipError_false);
+ loadXmlFile(paths.getStringValue("deadMessagesPatchFile"), SkipError_true);
loadXmlDir("deadMessagesPatchDir", loadXmlFile);
mLoaded = true;
}
-void DeadDB::loadXmlFile(const std::string &fileName)
+void DeadDB::loadXmlFile(const std::string &fileName,
+ const SkipError skipError)
{
XML::Document *doc = new XML::Document(fileName,
UseResman_true,
- SkipError_false);
+ skipError);
const XmlNodePtrConst root = doc->rootNode();
if (!root || !xmlNameEqual(root, "messages"))
@@ -67,7 +68,7 @@ void DeadDB::loadXmlFile(const std::string &fileName)
{
const std::string name = XML::getProperty(node, "name", "");
if (!name.empty())
- loadXmlFile(name);
+ loadXmlFile(name, skipError);
continue;
}
else if (xmlNameEqual(node, "message"))