synced with main repository

This commit is contained in:
Guenter Obiltschnig
2008-01-28 17:23:19 +00:00
parent fd1d5aed5f
commit da49971d0f
808 changed files with 1154 additions and 892 deletions

View File

@@ -1,7 +1,7 @@
//
// PatternFormatter.cpp
//
// $Id: //poco/Main/Foundation/src/PatternFormatter.cpp#13 $
// $Id: //poco/svn/Foundation/src/PatternFormatter.cpp#3 $
//
// Library: Foundation
// Package: Logging
@@ -41,8 +41,9 @@
#include "Poco/DateTime.h"
#include "Poco/Timestamp.h"
#include "Poco/Timezone.h"
#include "Poco/NumberFormatter.h"
#include "Poco/Environment.h"
#include <cstdio>
#include <cctype>
namespace Poco {
@@ -70,6 +71,30 @@ PatternFormatter::~PatternFormatter()
}
inline void PatternFormatter::fmt(std::string& str, int value)
{
char buffer[64];
std::sprintf(buffer, "%d", value);
str.append(buffer);
}
inline void PatternFormatter::fmt(std::string& str, int value, int width)
{
char buffer[64];
std::sprintf(buffer, "%*d", width, value);
str.append(buffer);
}
inline void PatternFormatter::fmt0(std::string& str, int value, int width)
{
char buffer[64];
std::sprintf(buffer, "%0*d", width, value);
str.append(buffer);
}
void PatternFormatter::format(const Message& msg, std::string& text)
{
Timestamp timestamp = msg.getTime();
@@ -91,33 +116,33 @@ void PatternFormatter::format(const Message& msg, std::string& text)
{
case 's': text.append(msg.getSource()); break;
case 't': text.append(msg.getText()); break;
case 'l': text.append(NumberFormatter::format((int) msg.getPriority())); break;
case 'l': fmt(text, (int) msg.getPriority()); break;
case 'p': text.append(getPriorityName((int) msg.getPriority())); break;
case 'q': text += getPriorityName((int) msg.getPriority()).at(0); break;
case 'P': text.append(NumberFormatter::format(msg.getPid())); break;
case 'P': fmt(text, msg.getPid()); break;
case 'T': text.append(msg.getThread()); break;
case 'I': text.append(NumberFormatter::format(msg.getTid())); break;
case 'I': fmt(text, msg.getTid()); break;
case 'N': text.append(Environment::nodeName()); break;
case 'w': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()], 0, 3); break;
case 'W': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()]); break;
case 'b': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1], 0, 3); break;
case 'B': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1]); break;
case 'd': text.append(NumberFormatter::format0(dateTime.day(), 2)); break;
case 'e': text.append(NumberFormatter::format(dateTime.day())); break;
case 'f': text.append(NumberFormatter::format(dateTime.day(), 2)); break;
case 'm': text.append(NumberFormatter::format0(dateTime.month(), 2)); break;
case 'n': text.append(NumberFormatter::format(dateTime.month())); break;
case 'o': text.append(NumberFormatter::format(dateTime.month(), 2)); break;
case 'y': text.append(NumberFormatter::format0(dateTime.year() % 100, 2)); break;
case 'Y': text.append(NumberFormatter::format0(dateTime.year(), 4)); break;
case 'H': text.append(NumberFormatter::format0(dateTime.hour(), 2)); break;
case 'h': text.append(NumberFormatter::format0(dateTime.hourAMPM(), 2)); break;
case 'd': fmt0(text, dateTime.day(), 2); break;
case 'e': fmt(text, dateTime.day()); break;
case 'f': fmt(text, dateTime.day(), 2); break;
case 'm': fmt0(text, dateTime.month(), 2); break;
case 'n': fmt(text, dateTime.month()); break;
case 'o': fmt(text, dateTime.month(), 2); break;
case 'y': fmt0(text, dateTime.year() % 100, 2); break;
case 'Y': fmt0(text, dateTime.year(), 4); break;
case 'H': fmt0(text, dateTime.hour(), 2); break;
case 'h': fmt0(text, dateTime.hourAMPM(), 2); break;
case 'a': text.append(dateTime.isAM() ? "am" : "pm"); break;
case 'A': text.append(dateTime.isAM() ? "AM" : "PM"); break;
case 'M': text.append(NumberFormatter::format0(dateTime.minute(), 2)); break;
case 'S': text.append(NumberFormatter::format0(dateTime.second(), 2)); break;
case 'i': text.append(NumberFormatter::format0(dateTime.millisecond(), 3)); break;
case 'c': text.append(NumberFormatter::format(dateTime.millisecond()/100)); break;
case 'M': fmt0(text, dateTime.minute(), 2); break;
case 'S': fmt0(text, dateTime.second(), 2); break;
case 'i': fmt0(text, dateTime.millisecond(), 3); break;
case 'c': fmt(text, dateTime.millisecond()/100); break;
case 'z': text.append(DateTimeFormatter::tzdISO(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break;
case 'Z': text.append(DateTimeFormatter::tzdRFC(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break;
case '[':