tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

fixed: when demonizing there were some logs info put twice in the log file

Browse Source 
now we first demonize (fork) and then open the log file
added: start adding support for PT::Date 
       we are using instead of tz system structure



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@836 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2012-05-19 15:14:35 +00:00
parent 67099d5d06
commit 0df088e1e2
26 changed files with 1055 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
db/Makefile.dep
View File

@@ -2,7 +2,7 @@
db.o: db.h dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
db.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
db.o: ../core/requesttypes.h ../core/error.h
db.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
db.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
db.o: dbitemquery.h ../core/item.h dbitemcolumns.h ../core/user.h
db.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -13,19 +13,20 @@ db.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
db.o: ../core/mount.h ../templates/locale.h ../core/log.h ../core/misc.h
dbbase.o: dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
dbbase.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
dbbase.o: ../core/requesttypes.h ../core/error.h
dbbase.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
dbbase.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
dbbase.o: ../core/log.h ../core/misc.h ../../pikotools/utf8/utf8.h
dbconn.o: dbconn.h dbtextstream.h ../core/textstream.h ../core/misc.h
dbconn.o: ../core/item.h ../../pikotools/space/space.h ../core/requesttypes.h
dbconn.o: ../core/log.h ../core/error.h
dbconn.o: ../../pikotools/date/date.h ../core/log.h ../core/error.h
dbitemcolumns.o: dbitemcolumns.h ../core/item.h dbbase.h dbconn.h
dbitemcolumns.o: dbtextstream.h ../core/textstream.h ../core/misc.h
dbitemcolumns.o: ../core/item.h ../../pikotools/space/space.h
dbitemcolumns.o: ../core/requesttypes.h ../core/error.h
dbitemcolumns.o: ../../pikotools/space/spaceparser.h
dbitemcolumns.o: ../core/requesttypes.h ../../pikotools/date/date.h
dbitemcolumns.o: ../core/error.h ../../pikotools/space/spaceparser.h
dbitemcolumns.o: ../../pikotools/space/space.h ../core/log.h
dbitemquery.o: dbitemquery.h ../core/item.h
dbtextstream.o: dbtextstream.h ../core/textstream.h ../core/misc.h
dbtextstream.o: ../core/item.h ../../pikotools/space/space.h
dbtextstream.o: ../core/requesttypes.h ../../pikotools/utf8/utf8.h
dbtextstream.o: ../core/requesttypes.h ../../pikotools/date/date.h
dbtextstream.o: ../../pikotools/utf8/utf8.h

26
db/dbtextstream.cpp
View File

@@ -76,13 +76,13 @@ DbTextStream & DbTextStream::PutText(const std::wstring & str)
DbTextStream & DbTextStream::operator<<(const RawText<const char*> & raw)
DbTextStream & DbTextStream::operator<<(RawText<const char*> raw)
{
return PutText(raw.par);
}
DbTextStream & DbTextStream::operator<<(const RawText<const wchar_t*> & raw)
DbTextStream & DbTextStream::operator<<(RawText<const wchar_t*> raw)
{
return PutText(raw.par);
}
@@ -194,7 +194,7 @@ return *this;
}
DbTextStream & DbTextStream::operator<<(const RawText<tm> & t)
DbTextStream & DbTextStream::operator<<(RawText<tm> t)
{
buffer += ConvertTime(t.par);
was_param = false;
@@ -203,6 +203,14 @@ return *this;
}
DbTextStream & DbTextStream::operator<<(RawText<PT::Date> date)
{
date.par.Serialize(*this);
was_param = false;
return *this;
}
@@ -591,5 +599,17 @@ return *this;
}
DbTextStream & DbTextStream::operator<<(const PT::Date & date)
{
if( was_param )
buffer += ", ";
buffer += '\'';
date.Serialize(*this);
buffer += '\'';
was_param = true;
return *this;
}

12
db/dbtextstream.h
View File

@@ -93,13 +93,13 @@ public:
"some string" is actually a table (not a pointer)
*/
template<size_t str_size>
DbTextStream & operator<<(const RawText<char [str_size]> & raw) { return PutText(raw.par); }
DbTextStream & operator<<(RawText<char [str_size]> raw) { return PutText(raw.par); }
template<size_t str_size>
DbTextStream & operator<<(const RawText<wchar_t [str_size]> & raw) { return PutText(raw.par); }
DbTextStream & operator<<(RawText<wchar_t [str_size]> raw) { return PutText(raw.par); }
DbTextStream & operator<<(const RawText<const char*> & raw);
DbTextStream & operator<<(const RawText<const wchar_t*> & raw);
DbTextStream & operator<<(RawText<const char*> raw);
DbTextStream & operator<<(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);
@@ -113,7 +113,8 @@ public:
DbTextStream & operator<<(RawText<unsigned long> raw);
DbTextStream & operator<<(RawText<double> raw);
DbTextStream & operator<<(RawText<void*> raw);
DbTextStream & operator<<(const RawText<tm> & t);
DbTextStream & operator<<(RawText<tm> t);
DbTextStream & operator<<(RawText<PT::Date> date);
/*
@@ -153,6 +154,7 @@ public:
DbTextStream & operator<<(const tm & t);
DbTextStream & operator<<(const std::vector<long> & tabid);
DbTextStream & operator<<(const PT::Space & space);
DbTextStream & operator<<(const PT::Date & date);
static const char * ConvertTime(const tm & t);