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

updated: to the new Pikotools API

Browse Source 
ConfParser is now SpaceParser
added:   to SessionManager
         Session * SessionManager::FindSession(long id)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@831 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2012-04-30 22:53:54 +00:00
parent fc33b4f882
commit c94b0311b6
38 changed files with 946 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
db/Makefile.dep
View File

@@ -1,33 +1,31 @@
# DO NOT DELETE
db.o: db.h dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
db.o: ../core/misc.h ../core/item.h ../../pikotools/confparser/space.h
db.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
db.o: ../core/requesttypes.h ../core/error.h
db.o: ../../pikotools/confparser/confparser.h
db.o: ../../pikotools/confparser/space.h dbitemquery.h ../core/item.h
db.o: dbitemcolumns.h ../core/user.h ../core/group.h ../core/dircontainer.h
db.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
db.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
db.o: ../core/request.h ../core/error.h ../core/config.h ../core/htmlfilter.h
db.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
db.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
db.o: ../templates/locale.h ../core/log.h ../core/misc.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
db.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
db.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
db.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
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/confparser/space.h
dbbase.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
dbbase.o: ../core/requesttypes.h ../core/error.h
dbbase.o: ../../pikotools/confparser/confparser.h
dbbase.o: ../../pikotools/confparser/space.h ../core/log.h ../core/misc.h
dbbase.o: ../../pikotools/utf8/utf8.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/confparser/space.h
dbconn.o: ../core/requesttypes.h ../core/log.h ../core/error.h
dbconn.o: ../core/item.h ../../pikotools/space/space.h ../core/requesttypes.h
dbconn.o: ../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/confparser/space.h
dbitemcolumns.o: ../core/item.h ../../pikotools/space/space.h
dbitemcolumns.o: ../core/requesttypes.h ../core/error.h
dbitemcolumns.o: ../../pikotools/confparser/confparser.h
dbitemcolumns.o: ../../pikotools/confparser/space.h ../core/log.h
dbitemcolumns.o: ../../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/confparser/space.h
dbtextstream.o: ../core/item.h ../../pikotools/space/space.h
dbtextstream.o: ../core/requesttypes.h ../../pikotools/utf8/utf8.h

6
db/dbbase.cpp
View File

@@ -232,13 +232,13 @@ bool DbBase::AssertValueSpace(PGresult * r, int row, int col, PT::Space & space,
conf_parser.SetSpace(space);
space.Clear();
PT::ConfParser::Status status = conf_parser.ParseString(res);
PT::SpaceParser::Status status = conf_parser.ParseString(res);
if( status != PT::ConfParser::ok )
if( status != PT::SpaceParser::ok )
{
log << log1 << "Db: a problem with parsing a PT::Space";
if( status == PT::ConfParser::syntax_error )
if( status == PT::SpaceParser::syntax_error )
log << ", syntax error at line: " << conf_parser.line;
log << logend;

4
db/dbbase.h
View File

@@ -16,7 +16,7 @@
#include <vector>
#include <string>
#include "core/error.h"
#include "confparser/confparser.h"
#include "space/spaceparser.h"
class DbBase
@@ -95,7 +95,7 @@ private:
static int UnescapeBin(const char * str, size_t & i, size_t len);
DbTextStream bquery;
PT::ConfParser conf_parser;
PT::SpaceParser conf_parser;
};