sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configfile

Browse Source
This commit is contained in:
doitux
2012-01-09 17:41:08 +00:00
parent 5769423595
commit b9793bbb25
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+27 -7
View File
@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
myConfigState = OK; myConfigState = OK;
// !!!! Revisionsnummer der Configdefaults !!!!! // !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 94; configRev = 95;
//standard defaults //standard defaults
logOnOffDefault = "1"; logOnOffDefault = "1";
@@ -258,7 +258,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
configList.push_back(ConfigInfo("LogOnOff", CONFIG_TYPE_INT, logOnOffDefault)); configList.push_back(ConfigInfo("LogOnOff", CONFIG_TYPE_INT, logOnOffDefault));
configList.push_back(ConfigInfo("LogDir", CONFIG_TYPE_STRING, logDir)); configList.push_back(ConfigInfo("LogDir", CONFIG_TYPE_STRING, logDir));
configList.push_back(ConfigInfo("LogStoreDuration", CONFIG_TYPE_INT, "2")); configList.push_back(ConfigInfo("LogStoreDuration", CONFIG_TYPE_INT, "2"));
configList.push_back(ConfigInfo("LogInterval", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("LogInterval", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("UserDataDir", CONFIG_TYPE_STRING, dataDir)); configList.push_back(ConfigInfo("UserDataDir", CONFIG_TYPE_STRING, dataDir));
configList.push_back(ConfigInfo("CacheDir", CONFIG_TYPE_STRING, cacheDir)); configList.push_back(ConfigInfo("CacheDir", CONFIG_TYPE_STRING, cacheDir));
configList.push_back(ConfigInfo("CLA_NoWriteAccess", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("CLA_NoWriteAccess", CONFIG_TYPE_INT, "0"));
@@ -497,28 +497,48 @@ void ConfigFile::updateConfig(ConfigState myConfigState)
root->LinkEndChild( config ); root->LinkEndChild( config );
//change configRev and AppDataPath //change configRev and AppDataPath
std::list<std::string> noUpdateElemtsList;
TiXmlElement * confElement0 = new TiXmlElement( "ConfigRevision" ); TiXmlElement * confElement0 = new TiXmlElement( "ConfigRevision" );
config->LinkEndChild( confElement0 ); config->LinkEndChild( confElement0 );
confElement0->SetAttribute("value", configRev); confElement0->SetAttribute("value", configRev);
noUpdateElemtsList.push_back("ConfigRevision");
TiXmlElement * confElement1 = new TiXmlElement( "AppDataDir" ); TiXmlElement * confElement1 = new TiXmlElement( "AppDataDir" );
config->LinkEndChild( confElement1 ); config->LinkEndChild( confElement1 );
confElement1->SetAttribute("value", myQtToolsInterface->stringToUtf8(myQtToolsInterface->getDataPathStdString(myArgv0))); confElement1->SetAttribute("value", myQtToolsInterface->stringToUtf8(myQtToolsInterface->getDataPathStdString(myArgv0)));
noUpdateElemtsList.push_back("AppDataDir");
///////// VERSION HACK SECTION ///////////////////////
//this is the right place for special version depending config hacks:
//0.9.1 - log interval needs to be set to 1 instead of 0
if (configRev == 95) // this means 0.9.1
{
TiXmlElement * confElement2 = new TiXmlElement( "LogInterval" );
config->LinkEndChild( confElement2 );
confElement2->SetAttribute("value", 1);
noUpdateElemtsList.push_back("LogInterval");
}
///////// VERSION HACK SECTION ///////////////////////
TiXmlHandle oldDocHandle( &oldDoc ); TiXmlHandle oldDocHandle( &oldDoc );
for (i=0; i<configList.size(); i++) { for (i=0; i<configList.size(); i++) {
//test
bool contains = noUpdateElemtsList.find(value) != mylist.end();
/////// HIER GEHTS WEITER LOTHAR ;) ///////
TiXmlElement* oldConf = oldDocHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).ToElement(); TiXmlElement* oldConf = oldDocHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).ToElement();
// //HACK remove after 0.6 if ( oldConf ) { // if element is already there --> take over the saved values
// TiXmlElement* ISAIRCChannelUpdateDone = oldDocHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( "InternetServerAddressIRCChannelUpdateDone" ).ToElement();
if ( oldConf /*&& (ISAIRCChannelUpdateDone || !(configList[i].name == "IRCChannel" || (configList[i].name == "InternetServerAddress" )))*/ /*HACK remove after 0.6*/ ) { // dont update ConfigRevision and AppDataDir AND possible hacked Config-Elements becaus it was already set ^^
// if element is already there --> take over the saved values
if(configList[i].name != "ConfigRevision" && configList[i].name != "AppDataDir") { if(configList[i].name != "ConfigRevision" && configList[i].name != "AppDataDir") {
// dont update ConfigRevision and AppDataDir becaus it was already set ^
TiXmlElement *tmpElement = new TiXmlElement(configList[i].name); TiXmlElement *tmpElement = new TiXmlElement(configList[i].name);
config->LinkEndChild( tmpElement ); config->LinkEndChild( tmpElement );