722 // Create a cinidata object for parsing the testexecute.ini |
722 // Create a cinidata object for parsing the testexecute.ini |
723 CTestExecuteIniData* parseTestExecuteIni = NULL; |
723 CTestExecuteIniData* parseTestExecuteIni = NULL; |
724 TBuf<KMaxTestExecuteNameLength> resultFilePath; |
724 TBuf<KMaxTestExecuteNameLength> resultFilePath; |
725 TBuf<KMaxTestExecuteNameLength> xmlFilePath; |
725 TBuf<KMaxTestExecuteNameLength> xmlFilePath; |
726 TInt logMode; |
726 TInt logMode; |
|
727 TInt loggerChannel ; |
727 TInt logLevel; |
728 TInt logLevel; |
728 |
729 |
729 TRAPD(err,parseTestExecuteIni = CTestExecuteIniData::NewL()); |
730 TRAPD(err,parseTestExecuteIni = CTestExecuteIniData::NewL()); |
730 if (err == KErrNone) |
731 if (err == KErrNone) |
731 { |
732 { |
734 parseTestExecuteIni->GetKeyValueFromIni(KTEFHtmlKey, resultFilePath); |
735 parseTestExecuteIni->GetKeyValueFromIni(KTEFHtmlKey, resultFilePath); |
735 parseTestExecuteIni->GetKeyValueFromIni(KTEFXmlKey, xmlFilePath); |
736 parseTestExecuteIni->GetKeyValueFromIni(KTEFXmlKey, xmlFilePath); |
736 parseTestExecuteIni->GetKeyValueFromIni(KTEFLogMode, logMode); |
737 parseTestExecuteIni->GetKeyValueFromIni(KTEFLogMode, logMode); |
737 parseTestExecuteIni->GetKeyValueFromIni(KTEFLogSeverityKey, logLevel); |
738 parseTestExecuteIni->GetKeyValueFromIni(KTEFLogSeverityKey, logLevel); |
738 parseTestExecuteIni->GetKeyValueFromIni(KTEFEnableIniAccessLog, IniAccessLog()); |
739 parseTestExecuteIni->GetKeyValueFromIni(KTEFEnableIniAccessLog, IniAccessLog()); |
|
740 parseTestExecuteIni->GetKeyValueFromIni(KTEFLogChannel, loggerChannel); |
739 } |
741 } |
740 else |
742 else |
741 { |
743 { |
|
744 TBuf<KMaxTestExecuteNameLength> testExecuteLogPath(KTestExecuteLogPath); |
742 resultFilePath.Copy(KTestExecuteLogPath); |
745 resultFilePath.Copy(KTestExecuteLogPath); |
743 xmlFilePath.Copy(KTestExecuteLogPath); |
746 xmlFilePath.Copy(KTestExecuteLogPath); |
744 logMode = TLoggerOptions(ELogHTMLOnly); |
747 logMode = TLoggerOptions(ELogHTMLOnly); |
745 logLevel = RFileFlogger::TLogSeverity(ESevrAll); |
748 logLevel = RFileFlogger::TLogSeverity(ESevrAll); |
746 IniAccessLog() = ETrue; |
749 IniAccessLog() = ETrue; |
747 } |
750 } |
748 Logger().SetLoggerOptions(logMode); |
751 Logger().SetLoggerOptions(logMode); |
|
752 Logger().SetLoggerChannel(loggerChannel) ; |
749 |
753 |
750 // Initialise a handle to the file logger |
754 // Initialise a handle to the file logger |
751 User::LeaveIfError(Logger().Connect()); |
755 User::LeaveIfError(Logger().Connect()); |
752 RFs fS; |
756 RFs fS; |
753 User::LeaveIfError(fS.Connect()); |
757 User::LeaveIfError(fS.Connect()); |
754 CleanupClosePushL(fS); |
758 CleanupClosePushL(fS); |
755 RFile file; |
759 RFile file; |
756 TBuf<KMaxTestExecuteNameLength> xmlLogFile(xmlFilePath); |
760 TBuf<KMaxTestExecuteNameLength> xmlLogFile(xmlFilePath); |
757 TBuf<KMaxTestExecuteNameLength> logFile; |
761 TBuf<KMaxTestStepNameLength> logFile; |
758 TBuf<KMaxTestExecuteNameLength> logFileNameFile(resultFilePath); |
762 TBuf<KMaxTestExecuteNameLength> logFileNameFile(resultFilePath); |
759 logFileNameFile.Append(KTestExecuteScheduleTestLogCompatibilityNameFile); |
763 logFileNameFile.Append(KTestExecuteScheduleTestLogCompatibilityNameFile); |
760 if(file.Open(fS,logFileNameFile,EFileRead | EFileShareAny) != KErrNone) |
764 if(file.Open(fS,logFileNameFile,EFileRead | EFileShareAny) != KErrNone) |
761 { |
765 { |
762 // For the old flogger we have to create an individual file |
766 // For the old flogger we have to create an individual file |
787 CleanupStack::Pop(&fS); |
791 CleanupStack::Pop(&fS); |
788 fS.Close(); |
792 fS.Close(); |
789 |
793 |
790 if (logMode == 0 || logMode == 2) |
794 if (logMode == 0 || logMode == 2) |
791 { |
795 { |
792 User::LeaveIfError(Logger().HtmlLogger().CreateLog(logFilePath,RTestExecuteLogServ::ELogModeAppend)); |
796 TRAPD(err1,Logger().HtmlLogger().CreateLog(logFilePath,RTestExecuteLogServ::ELogModeAppend)); |
|
797 if(err1 != KErrPathNotFound) |
|
798 { |
|
799 User::LeaveIfError(err1) ; |
|
800 } |
|
801 else |
|
802 { |
|
803 _LIT(KHtmExtension,".htm"); |
|
804 if(logFilePath.Find(KHtmExtension)>-1) |
|
805 { |
|
806 User::LeaveIfError(err1) ; |
|
807 } |
|
808 } |
793 Logger().HtmlLogger().SetLogLevel(TLogSeverity(logLevel)); |
809 Logger().HtmlLogger().SetLogLevel(TLogSeverity(logLevel)); |
794 } |
810 } |
795 if (logMode == 1 || logMode == 2) |
811 if (logMode == 1 || logMode == 2) |
796 { |
812 { |
797 User::LeaveIfError(Logger().XmlLogger().CreateLog(xmlLogFile,RFileFlogger::ELogModeAppend)); |
813 User::LeaveIfError(Logger().XmlLogger().CreateLog(xmlLogFile,RFileFlogger::ELogModeAppend)); |