updated: to the new Pikotools API

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

plugins/ticket/Makefile.dep

@@ -3,10 +3,9 @@
 createticket.o: createticket.h tdb.h ticket.h ../../db/dbbase.h
 createticket.o: ../../db/dbconn.h ../../db/dbtextstream.h
 createticket.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-createticket.o: ../../../pikotools/confparser/space.h
-createticket.o: ../../core/requesttypes.h ../../core/error.h
-createticket.o: ../../../pikotools/confparser/confparser.h
-createticket.o: ../../../pikotools/confparser/space.h
+createticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
+createticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+createticket.o: ../../../pikotools/space/space.h
 createticket.o: ../../functions/functionbase.h ../../core/item.h
 createticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
 createticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -61,11 +60,11 @@ createticket.o: ../../core/plugindata.h ../../functions/rm.h
 editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 editticket.o: ../../db/dbtextstream.h ../../core/textstream.h
 editticket.o: ../../core/misc.h ../../core/item.h
-editticket.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
-editticket.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
-editticket.o: ../../../pikotools/confparser/space.h ticketinfo.h
-editticket.o: ../../core/item.h ../../core/system.h ../../core/job.h
-editticket.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
+editticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
+editticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+editticket.o: ../../../pikotools/space/space.h ticketinfo.h ../../core/item.h
+editticket.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
+editticket.o: ../../core/synchro.h ../../core/dirs.h
 editticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
 editticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
 editticket.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
@@ -117,21 +116,20 @@ editticket.o: ../../functions/rm.h
 funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 funticket.o: ../../db/dbtextstream.h ../../core/textstream.h
 funticket.o: ../../core/misc.h ../../core/item.h
-funticket.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
-funticket.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
-funticket.o: ../../../pikotools/confparser/space.h ticketinfo.h
-funticket.o: ../../core/item.h ../../core/system.h ../../core/job.h
-funticket.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
-funticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-funticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
-funticket.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
-funticket.o: ../../core/ugcontainer.h ../../core/log.h
-funticket.o: ../../core/textstream.h ../../core/logmanipulators.h
-funticket.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
-funticket.o: ../../core/error.h ../../core/config.h ../../core/htmlfilter.h
-funticket.o: ../../templates/htmltextstream.h ../../core/session.h
-funticket.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
-funticket.o: ../../core/mount.h ../../templates/locale.h
+funticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
+funticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+funticket.o: ../../../pikotools/space/space.h ticketinfo.h ../../core/item.h
+funticket.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
+funticket.o: ../../core/synchro.h ../../core/dirs.h ../../core/dircontainer.h
+funticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
+funticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
+funticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h
+funticket.o: ../../core/log.h ../../core/textstream.h
+funticket.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
+funticket.o: ../../core/request.h ../../core/error.h ../../core/config.h
+funticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
+funticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
+funticket.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
 funticket.o: ../../notify/notify.h ../../notify/notifypool.h
 funticket.o: ../../templates/patterns.h ../../templates/locale.h
 funticket.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
@@ -177,10 +175,10 @@ funticket.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
 funticket.o: ../../plugins/thread/pluginmsg.h
 init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
-init.o: ../../core/item.h ../../../pikotools/confparser/space.h
+init.o: ../../core/item.h ../../../pikotools/space/space.h
 init.o: ../../core/requesttypes.h ../../core/error.h
-init.o: ../../../pikotools/confparser/confparser.h
-init.o: ../../../pikotools/confparser/space.h funticket.h ticketinfo.h
+init.o: ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h funticket.h ticketinfo.h
 init.o: ../../core/item.h ../../core/system.h ../../core/job.h
 init.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
 init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
@@ -235,14 +233,13 @@ init.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
 init.o: ../../plugins/thread/showthreads.h ../../plugins/thread/threadinfo.h
 init.o: ../../plugins/thread/thread.h ../../plugins/thread/pluginmsg.h
 sessiondata.o: sessiondata.h ../../core/plugindata.h ticket.h
-sessiondata.o: ../../functions/rm.h ../../../pikotools/confparser/space.h
+sessiondata.o: ../../functions/rm.h ../../../pikotools/space/space.h
 showtickets.o: showtickets.h tdb.h ticket.h ../../db/dbbase.h
 showtickets.o: ../../db/dbconn.h ../../db/dbtextstream.h
 showtickets.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-showtickets.o: ../../../pikotools/confparser/space.h
-showtickets.o: ../../core/requesttypes.h ../../core/error.h
-showtickets.o: ../../../pikotools/confparser/confparser.h
-showtickets.o: ../../../pikotools/confparser/space.h ticketinfo.h
+showtickets.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
+showtickets.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+showtickets.o: ../../../pikotools/space/space.h ticketinfo.h
 showtickets.o: ../../core/item.h ../../core/system.h ../../core/job.h
 showtickets.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
 showtickets.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
@@ -302,27 +299,26 @@ showtickets.o: ../../templates/changepatterns.h
 showtickets.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
 tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
-tdb.o: ../../core/item.h ../../../pikotools/confparser/space.h
+tdb.o: ../../core/item.h ../../../pikotools/space/space.h
 tdb.o: ../../core/requesttypes.h ../../core/error.h
-tdb.o: ../../../pikotools/confparser/confparser.h
-tdb.o: ../../../pikotools/confparser/space.h ../../core/log.h
+tdb.o: ../../../pikotools/space/spaceparser.h
+tdb.o: ../../../pikotools/space/space.h ../../core/log.h
 templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 templates.o: ../../../ezc/src/pattern.h ../../core/item.h
-templates.o: ../../../pikotools/confparser/space.h
-templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-templates.o: ../../../ezc/src/stringconv.h ../../../pikotools/utf8/utf8.h
-templates.o: ticketinfo.h ticket.h ../../core/item.h ../../core/system.h
-templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
-templates.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
-templates.o: ../../db/dbbase.h ../../db/dbitemquery.h
-templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-templates.o: ../../core/log.h ../../core/textstream.h
-templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-templates.o: ../../core/request.h ../../core/requesttypes.h
-templates.o: ../../core/error.h ../../core/config.h
-templates.o: ../../../pikotools/confparser/confparser.h
-templates.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+templates.o: ../../../pikotools/space/space.h ../../../ezc/src/functions.h
+templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+templates.o: ../../../pikotools/utf8/utf8.h ticketinfo.h ticket.h
+templates.o: ../../core/item.h ../../core/system.h ../../core/job.h
+templates.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
+templates.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
+templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
+templates.o: ../../core/ugcontainer.h ../../core/log.h
+templates.o: ../../core/textstream.h ../../core/logmanipulators.h
+templates.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
+templates.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h
+templates.o: ../../../pikotools/space/spaceparser.h
+templates.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 templates.o: ../../templates/htmltextstream.h ../../core/textstream.h
 templates.o: ../../core/misc.h ../../core/session.h ../../core/user.h
 templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
@@ -372,7 +368,7 @@ templates.o: ../../plugins/thread/pluginmsg.h ../../templates/miscspace.h
 templates.o: ../../templates/templates.h
 ticketinfo.o: ticketinfo.h ticket.h ../../core/item.h ../../core/system.h
 ticketinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
-ticketinfo.o: ../../../pikotools/confparser/space.h ../../core/dirs.h
+ticketinfo.o: ../../../pikotools/space/space.h ../../core/dirs.h
 ticketinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
 ticketinfo.o: ../../db/dbbase.h ../../db/dbitemquery.h
 ticketinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -381,8 +377,8 @@ ticketinfo.o: ../../core/log.h ../../core/textstream.h
 ticketinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
 ticketinfo.o: ../../core/request.h ../../core/requesttypes.h
 ticketinfo.o: ../../core/error.h ../../core/config.h
-ticketinfo.o: ../../../pikotools/confparser/confparser.h
-ticketinfo.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+ticketinfo.o: ../../../pikotools/space/spaceparser.h
+ticketinfo.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 ticketinfo.o: ../../templates/htmltextstream.h ../../core/textstream.h
 ticketinfo.o: ../../core/misc.h ../../core/session.h ../../core/user.h
 ticketinfo.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h

plugins/ticket/sessiondata.h

@@ -16,7 +16,7 @@
 #include "core/plugindata.h"
 #include "ticket.h"
 #include "functions/rm.h"
-#include "confparser/space.h"
+#include "space/space.h"
 
 
 namespace Ticket

plugins/ticket/templates.cpp

@@ -19,7 +19,7 @@
 #include "sessiondata.h"
 #include "plugins/thread/pluginmsg.h"
 #include "templates/miscspace.h"
-#include "confparser/space.h"
+#include "space/space.h"
 
 
 namespace Ticket

plugins/ticket/ticketinfo.cpp

@@ -138,7 +138,7 @@ bool TicketInfo::ParseTicketConf(long mount_dir_id, const std::wstring & path)
 	conf_parser.SplitSingle(true);
 	conf_tab[mount_dir_id].conf.Clear();
 
-return (conf_parser.ParseString(config_file.content) == PT::ConfParser::ok);
+return (conf_parser.ParseString(config_file.content) == PT::SpaceParser::ok);
 }
 
 

plugins/ticket/ticketinfo.h

@@ -18,7 +18,7 @@
 #include "functions/functions.h"
 #include "db/db.h"
 #include "tdb.h"
-#include "confparser/confparser.h"
+#include "space/spaceparser.h"
 
 
 
@@ -119,7 +119,7 @@ private:
 	std::wstring file_path;
 
 	// for reading config file
-	PT::ConfParser conf_parser;
+	PT::SpaceParser conf_parser;
 	std::vector<Item*> config_dir_tab;
 	Item config_file;