From 7c89e565b373803b64cabaac3695ac3e93469962 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Tue, 26 Oct 2010 20:02:07 -0400 Subject: This is the setting of the core file name date stamp code and settings files for Chat, Group and IM Logs. --HG-- branch : storm-102 --- indra/newview/lllogchat.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 3 deletions(-) (limited to 'indra/newview/lllogchat.cpp') diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 8c70b1e973..0e557cba5d 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -182,9 +182,25 @@ private: //static std::string LLLogChat::makeLogFileName(std::string filename) { + if( gSavedPerAccountSettings.getBOOL("LogFileNamewithDate") ) + { + time_t now; + time(&now); + char dbuffer[20]; /* Flawfinder: ignore */ + if (filename == "chat") + { + strftime(dbuffer, 20, "-%Y-%m-%d", localtime(&now)); + } + else + { + strftime(dbuffer, 20, "-%Y-%m", localtime(&now)); + } + filename += dbuffer; + } filename = cleanFileName(filename); filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS,filename); filename += ".txt"; + LL_INFOS("") << "Current:" << filename << LL_ENDL;/* uncomment if you want to verify step, delete on commit */ return filename; } @@ -355,9 +371,21 @@ void LLLogChat::loadAllHistory(const std::string& file_name, std::list& me return ; } - LLFILE* fptr = LLFile::fopen(makeLogFileName(file_name), "r"); /*Flawfinder: ignore*/ - if (!fptr) return; //No previous conversation with this name. - + LLFILE* fptr = LLFile::fopen(makeLogFileName(file_name), "r");/*Flawfinder: ignore*/ + // LL_INFOS("") << "Current:" << file_name << LL_ENDL;/* uncomment if you want to verify step, delete on commit */ + if (!fptr) + { + fptr = LLFile::fopen(oldLogFileName(file_name), "r");/*Flawfinder: ignore*/ + //LL_INFOS("") << "Old :" << file_name << LL_ENDL;/* uncomment if you want to verify step, delete on commit */ + if (!fptr) + { + fptr =LLFile::fopen(ndsLogFileName(file_name), "r");/*Flawfinder:ignore*/ + //LL_INFOS("") << "Orginal:" << file_name << LL_ENDL;/* uncomment if you want to verify step, delete on commit */ + if (!fptr) return; //No previous conversation with this name. + } + } + + LL_INFOS("") << "Reading:" << file_name << LL_ENDL; char buffer[LOG_RECALL_SIZE]; /*Flawfinder: ignore*/ char *bptr; S32 len; @@ -544,3 +572,31 @@ bool LLChatLogParser::parse(std::string& raw, LLSD& im) im[IM_TEXT] = name_and_text[IDX_TEXT]; return true; //parsed name and message text, maybe have a timestamp too } +std::string LLLogChat::oldLogFileName(std::string filename) +{ + time_t now; + time_t yesterday = time(&now) - 86400; + char dbuffer[20]; /* Flawfinder: ignore */ + if (filename == "chat") + { + strftime(dbuffer, 20, "-%Y-%m-%d", localtime(&yesterday)); + } + else + { + strftime(dbuffer, 20, "-%Y-%m", localtime(&yesterday)); + } + filename += dbuffer; + filename = cleanFileName(filename); + filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS,filename); + filename += ".txt"; + //LL_INFOS("") << "Old :" << filename << LL_ENDL;/* uncomment if you want to verify step, delete on commit */ + return filename; +} +std::string LLLogChat::ndsLogFileName(std::string filename) +{ + filename = cleanFileName(filename); + filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS,filename); + filename += ".txt"; + //LL_INFOS("") << "Original:" << filename << LL_ENDL;/* uncomment if you want to verify step, delete on commit */ + return filename; +} -- cgit v1.3 From 669cf170ceae2609202fb948d388b7492f8eb90a Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Mon, 8 Nov 2010 09:31:35 -0500 Subject: STORM-102: STORM-143: Refactored the STORM-103 code to pull the proper plain test log no matter when it was generated or if it has the date stamp in the name of the log or not. --HG-- branch : storm-102 --- doc/contributions.txt | 1 + .../newview/app_settings/settings_per_account.xml | 2 +- indra/newview/lllogchat.cpp | 67 +++++++++++----------- indra/newview/lllogchat.h | 1 - 4 files changed, 34 insertions(+), 37 deletions(-) (limited to 'indra/newview/lllogchat.cpp') diff --git a/doc/contributions.txt b/doc/contributions.txt index 18501220ac..7343abd700 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -755,6 +755,7 @@ WolfPup Lowenhar SNOW-772 STORM-102 STORM-103 + STORM-143 VWR-20741 VWR-20933 Zai Lynch diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index ab702e49e1..705c73cbf7 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -119,7 +119,7 @@ Type Boolean Value - 1 + 0