diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-12 00:18:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-12 00:51:22 +0300 |
| commit | d5a00a320043f5782ebc489285c89943b667e094 (patch) | |
| tree | eb64f3b1f81f7ba2a3c7ff9e02ad329ef21abb83 /src/resources/db/petdb.cpp | |
| parent | 742b2a22bdcb69e6f615a284065ba2696e7bc261 (diff) | |
| download | plus-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/petdb.cpp')
| -rw-r--r-- | src/resources/db/petdb.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp index 6c56f3437..03791945b 100644 --- a/src/resources/db/petdb.cpp +++ b/src/resources/db/petdb.cpp @@ -47,15 +47,18 @@ void PETDB::load() unload(); logger->log1("Initializing PET database..."); - loadXmlFile(paths.getStringValue("petsFile")); - loadXmlFile(paths.getStringValue("petsPatchFile")); + loadXmlFile(paths.getStringValue("petsFile"), SkipError_false); + loadXmlFile(paths.getStringValue("petsPatchFile"), SkipError_true); loadXmlDir("petsPatchDir", loadXmlFile); mLoaded = true; } -void PETDB::loadXmlFile(const std::string &fileName) +void PETDB::loadXmlFile(const std::string &fileName, + const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, SkipError_false); + XML::Document doc(fileName, + UseResman_true, + skipError); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "pets")) @@ -72,7 +75,7 @@ void PETDB::loadXmlFile(const std::string &fileName) { const std::string name = XML::getProperty(petNode, "name", ""); if (!name.empty()) - loadXmlFile(name); + loadXmlFile(name, skipError); continue; } else if (!xmlNameEqual(petNode, "pet")) |