From: <ste...@us...> - 2011-05-16 05:21:49
|
Revision: 1277 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1277&view=rev Author: stef145g Date: 2011-05-16 05:21:43 +0000 (Mon, 16 May 2011) Log Message: ----------- Relocate settings from mmexini database to user database. Modified Paths: -------------- trunk/mmex/src/mmyahoo.cpp trunk/mmex/src/mmyahoo.h trunk/mmex/src/stockspanel.cpp Modified: trunk/mmex/src/mmyahoo.cpp =================================================================== --- trunk/mmex/src/mmyahoo.cpp 2011-05-16 03:52:15 UTC (rev 1276) +++ trunk/mmex/src/mmyahoo.cpp 2011-05-16 05:21:43 UTC (rev 1277) @@ -22,7 +22,7 @@ #include "mmyahoo.h" /** There is NO default constructor - we need a settings database to talk to **/ -mmYahoo::mmYahoo(wxSQLite3Database* inidb) : inidb_(inidb) +mmYahoo::mmYahoo(wxSQLite3Database* inidb, wxSQLite3Database* db) : inidb_(inidb), db_(db) { ReadSettings(); } @@ -36,28 +36,25 @@ /// ------------------------------------------------------------------ void mmYahoo::ReadSettings() { - mmDBWrapper::getINISettingValue(inidb_, - wxT("STOCKS_REFRESH_ENABLED"), - wxT("0")).ToLong(&UpdatingEnabled_); - OpenTimeStr_ = mmDBWrapper::getINISettingValue(inidb_, - wxT("STOCKS_MARKET_OPEN_TIME"), - wxT("10:15:00")).GetData() ; - CloseTimeStr_ = mmDBWrapper::getINISettingValue(inidb_, - wxT("STOCKS_MARKET_CLOSE_TIME"), - wxT("16:40:00")).GetData() ; - - // Get time of last update - if ( NULL == LastRefreshDT_.ParseDateTime( mmDBWrapper::getINISettingValue(inidb_, - wxT("STOCKS_LAST_REFRESH_DATETIME"), wxT("")).GetData() ) ) + // Get values from mmexini.db3 + mmDBWrapper::getINISettingValue(inidb_, wxT("STOCKS_REFRESH_ENABLED"), + wxT("0")).ToLong(&UpdatingEnabled_); + // Get values from user database + OpenTimeStr_ = mmDBWrapper::getInfoSettingValue(db_, wxT("STOCKS_MARKET_OPEN_TIME"), + wxT("10:15:00")).GetData() ; + CloseTimeStr_ = mmDBWrapper::getInfoSettingValue(db_, wxT("STOCKS_MARKET_CLOSE_TIME"), + wxT("16:40:00")).GetData() ; + // Get time of last update from user database + if ( NULL == LastRefreshDT_.ParseDateTime( + mmDBWrapper::getInfoSettingValue(db_, wxT("STOCKS_LAST_REFRESH_DATETIME"), wxT("")).GetData()) + ) LastRefreshDT_ = wxInvalidDateTime; - mmDBWrapper::getINISettingValue(inidb_, - wxT("STOCKS_REFRESH_MINUTES"), - wxT("30")).ToLong(&UpdateIntervalMinutes_); + mmDBWrapper::getInfoSettingValue(db_, wxT("STOCKS_REFRESH_MINUTES"), wxT("30")).ToLong(&UpdateIntervalMinutes_); // Server - Server_ = mmDBWrapper::getINISettingValue(inidb_,wxT("HTTP_YAHOO_SERVER"),wxT("download.finance.yahoo.com")); - Suffix_ = mmDBWrapper::getINISettingValue(inidb_,wxT("HTTP_YAHOO_SUFFIX"), wxT("")); + Server_ = mmDBWrapper::getInfoSettingValue(db_,wxT("HTTP_YAHOO_SERVER"),wxT("download.finance.yahoo.com")); + Suffix_ = mmDBWrapper::getInfoSettingValue(db_,wxT("HTTP_YAHOO_SUFFIX"), wxT("")); //TODO:Store CSVColumns_ in config / INI item // CSVColumns_ = wxT("snghl1c1vd1t1"); @@ -66,9 +63,7 @@ // Proxy long LongTemp; - mmDBWrapper::getINISettingValue(inidb_, - wxT("HTTP_USE_PROXY"), - wxT("0")).ToLong(&LongTemp); + mmDBWrapper::getINISettingValue(inidb_, wxT("HTTP_USE_PROXY"), wxT("0")).ToLong(&LongTemp); } /// ------------------------------------------------------------------ @@ -76,19 +71,21 @@ /// ------------------------------------------------------------------ void mmYahoo::WriteSettings() { - // Status + // Status - Save to mmexini.db3 mmDBWrapper::setINISettingValue(inidb_, wxT("STOCKS_REFRESH_ENABLED"), wxString::Format(wxT("%d"),UpdatingEnabled_)); - mmDBWrapper::setINISettingValue(inidb_, wxT("STOCKS_MARKET_OPEN_TIME"), OpenTimeStr_) ; - mmDBWrapper::setINISettingValue(inidb_, wxT("STOCKS_MARKET_CLOSE_TIME"), CloseTimeStr_) ; + + // Save to user database + mmDBWrapper::setInfoSettingValue(db_, wxT("STOCKS_MARKET_OPEN_TIME"), OpenTimeStr_) ; + mmDBWrapper::setInfoSettingValue(db_, wxT("STOCKS_MARKET_CLOSE_TIME"), CloseTimeStr_) ; if (LastRefreshDT_.IsValid() ) { - mmDBWrapper::setINISettingValue(inidb_, wxT("STOCKS_LAST_REFRESH_DATETIME"), wxString::Format(wxT("%s %s"), - LastRefreshDT_.FormatISODate().c_str(),LastRefreshDT_.FormatISOTime().c_str())); + mmDBWrapper::setInfoSettingValue(db_, wxT("STOCKS_LAST_REFRESH_DATETIME"), wxString::Format(wxT("%s %s"), + LastRefreshDT_.FormatISODate().c_str(),LastRefreshDT_.FormatISOTime().c_str())); } - mmDBWrapper::setINISettingValue(inidb_, wxT("STOCKS_REFRESH_MINUTES"),wxString::Format(wxT("%d"),UpdateIntervalMinutes_)); + mmDBWrapper::setInfoSettingValue(db_, wxT("STOCKS_REFRESH_MINUTES"),wxString::Format(wxT("%d"),UpdateIntervalMinutes_)); // Server - mmDBWrapper::setINISettingValue(inidb_,wxT("HTTP_YAHOO_SERVER"),Server_); - mmDBWrapper::setINISettingValue(inidb_,wxT("HTTP_YAHOO_SUFFIX"),Suffix_); + mmDBWrapper::setInfoSettingValue(db_,wxT("HTTP_YAHOO_SERVER"),Server_); + mmDBWrapper::setInfoSettingValue(db_,wxT("HTTP_YAHOO_SUFFIX"),Suffix_); } Modified: trunk/mmex/src/mmyahoo.h =================================================================== --- trunk/mmex/src/mmyahoo.h 2011-05-16 03:52:15 UTC (rev 1276) +++ trunk/mmex/src/mmyahoo.h 2011-05-16 05:21:43 UTC (rev 1277) @@ -26,7 +26,7 @@ class mmYahoo { public: - mmYahoo( wxSQLite3Database* inidb ); + mmYahoo( wxSQLite3Database* inidb, wxSQLite3Database* db ); ~mmYahoo(); private: @@ -42,6 +42,7 @@ } StocksRefreshStatus_; wxSQLite3Database* inidb_; + wxSQLite3Database* db_; wxString Suffix_; wxString OpenTimeStr_; wxString CloseTimeStr_; Modified: trunk/mmex/src/stockspanel.cpp =================================================================== --- trunk/mmex/src/stockspanel.cpp 2011-05-16 03:52:15 UTC (rev 1276) +++ trunk/mmex/src/stockspanel.cpp 2011-05-16 05:21:43 UTC (rev 1277) @@ -102,7 +102,7 @@ listCtrlAccount_->EnsureVisible(((int)trans_.size()) - 1); // Greg Newton - yahoo_ = new mmYahoo(inidb_); + yahoo_ = new mmYahoo(inidb_, db_); DownloadScheduleTimer_=NULL; StatusRefreshTimer_=NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |