added: uptime winix function prints how many sessions there are
changed: functions for text/numbers conversions
int Toi(const std::string & str, int base = 10);
int Toi(const std::wstring & str, int base = 10);
int Toi(const char * str, int base = 10);
int Toi(const wchar_t * str, int base = 10);
long Tol(const std::string & str, int base = 10);
long Tol(const std::wstring & str, int base = 10);
long Tol(const char * str, int base = 10);
long Tol(const wchar_t * str, int base = 10);
template<class CharType>
bool Toa(unsigned long value, CharType * buffer, size_t buf_len, int base = 10);
template<class CharType>
bool Toa(long value, CharType * buffer, size_t buf_len, int base = 10);
template<class CharType>
bool Toa(unsigned int value, CharType * buffer, size_t buf_len, int base = 10);
template<class CharType>
bool Toa(int value, CharType * buffer, size_t buf_len, int base = 10);
const wchar_t * Toa(unsigned int value, int base = 10);
const wchar_t * Toa(unsigned long value, int base = 10);
const wchar_t * Toa(int value, int base = 10);
const wchar_t * Toa(long value, int base = 10);
void Toa(int value, std::string & res, int base = 10, bool clear = true);
void Toa(long value, std::string & res, int base = 10, bool clear = true);
void Toa(int value, std::wstring & res, int base = 10, bool clear = true);
void Toa(long value, std::wstring & res, int base = 10, bool clear = true);
added: HtmlTextStream class (files htmltextstream.cpp htmltextstream.h in templates)
this is a special stream for automatically escaping html tags
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@682 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -273,7 +273,7 @@ Error Db::AddItemIntoItem(Item & item)
|
||||
item.id = AssertCurrval("core.item_id_seq");
|
||||
|
||||
if( !url_without_id )
|
||||
ToString(item.url, item.id);
|
||||
Toa(item.id, item.url);
|
||||
}
|
||||
catch(const Error & e)
|
||||
{
|
||||
@@ -384,7 +384,7 @@ Error Db::EditItemInItem(Item & item, bool with_url)
|
||||
AssertResult(r, PGRES_COMMAND_OK);
|
||||
|
||||
if( with_url && !url_without_id )
|
||||
ToString(item.url, item.id);
|
||||
Toa(item.id, item.url);
|
||||
}
|
||||
catch(const Error & e)
|
||||
{
|
||||
|
||||
@@ -282,12 +282,12 @@ tm t;
|
||||
return t;
|
||||
}
|
||||
|
||||
t.tm_year = atoi(str + 0) - 1900; /* year - 1900 */
|
||||
t.tm_mon = atoi(str + 5) - 1; /* month of year (0 - 11) */
|
||||
t.tm_mday = atoi(str + 8); /* day of month (1 - 31) */
|
||||
t.tm_hour = atoi(str + 11); /* hours (0 - 23) */
|
||||
t.tm_min = atoi(str + 14); /* minutes (0 - 59) */
|
||||
t.tm_sec = atoi(str + 17); /* seconds (0 - 60) */
|
||||
t.tm_year = Toi(str + 0) - 1900; /* year - 1900 */
|
||||
t.tm_mon = Toi(str + 5) - 1; /* month of year (0 - 11) */
|
||||
t.tm_mday = Toi(str + 8); /* day of month (1 - 31) */
|
||||
t.tm_hour = Toi(str + 11); /* hours (0 - 23) */
|
||||
t.tm_min = Toi(str + 14); /* minutes (0 - 59) */
|
||||
t.tm_sec = Toi(str + 17); /* seconds (0 - 60) */
|
||||
|
||||
// t.tm_wday = 0; /* day of week (Sunday = 0) */
|
||||
// t.tm_yday = 0; /* day of year (0 - 365) */
|
||||
|
||||
@@ -88,16 +88,26 @@ DbTextStream & DbTextStream::operator<<(const RawText<const wchar_t*> & raw)
|
||||
}
|
||||
|
||||
|
||||
DbTextStream & DbTextStream::operator<<(RawText<const std::string*> raw)
|
||||
{
|
||||
return PutText(raw.par);
|
||||
}
|
||||
|
||||
|
||||
DbTextStream & DbTextStream::operator<<(RawText<const std::wstring*> raw)
|
||||
{
|
||||
return PutText(raw.par);
|
||||
}
|
||||
|
||||
DbTextStream & DbTextStream::operator<<(RawText<std::string> raw)
|
||||
{
|
||||
return PutText(raw.par.c_str());
|
||||
return PutText(raw.par);
|
||||
}
|
||||
|
||||
|
||||
DbTextStream & DbTextStream::operator<<(RawText<std::wstring> raw)
|
||||
{
|
||||
return PutText(raw.par.c_str());
|
||||
return PutText(raw.par);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
/*
|
||||
DbTextStream is used as a buffer for creating a database's query
|
||||
By default all operators<< espace its string artuments. If you don't want
|
||||
By default all operators<< escape its string artuments. If you don't want
|
||||
to escape an argument you should use a helper function R() (raw argument)
|
||||
note: you have to define the function yourself, we do not provide it
|
||||
because such a short name would make a mess in namespaces
|
||||
@@ -98,8 +98,10 @@ public:
|
||||
template<size_t str_size>
|
||||
DbTextStream & operator<<(const RawText<wchar_t [str_size]> & raw) { return PutText(raw.par); }
|
||||
|
||||
DbTextStream & operator<<(const RawText<const char*> & raw); // !! ? bez const tutaj? bo jest const w szablonie
|
||||
DbTextStream & operator<<(const RawText<const char*> & raw);
|
||||
DbTextStream & operator<<(const RawText<const wchar_t*> & raw);
|
||||
DbTextStream & operator<<(RawText<const std::string*> raw);
|
||||
DbTextStream & operator<<(RawText<const std::wstring*> raw);
|
||||
DbTextStream & operator<<(RawText<std::string> raw);
|
||||
DbTextStream & operator<<(RawText<std::wstring> raw);
|
||||
DbTextStream & operator<<(RawText<char> raw);
|
||||
|
||||
Reference in New Issue
Block a user