WIP: remove the old database abstraction layer

remove such classes:
- DbBase
- DbConn
- DbTextStream
- Db

while here:
- remove: TextStream, SLog, TexTextStream
This commit is contained in:
2024-06-22 18:03:54 +02:00
parent 5d457f3d4b
commit 6aa100f12c
138 changed files with 6658 additions and 12402 deletions

View File

@@ -1,30 +1,36 @@
# DO NOT DELETE
./edb.o: edb.h ../../../../winix/winixd/db/dbbase.h
./edb.o: ../../../../winix/winixd/db/dbconn.h
./edb.o: ../../../../winix/winixd/db/dbtextstream.h
./edb.o: ../../../../winix/winixd/core/textstream.h
./edb.o: ../../../../winix/winixd/core/misc.h
./edb.o: ../../../../winix/winixd/core/requesttypes.h
./edb.o: edb.h export.h ../../../../morm/src/model.h
./edb.o: ../../../../pikotools/src/textstream/textstream.h
./edb.o: ../../../../pikotools/src/textstream/stream.h
./edb.o: ../../../../pikotools/src/space/space.h
./edb.o: ../../../../pikotools/src/convert/inttostr.h
./edb.o: ../../../../pikotools/src/utf8/utf8.h
./edb.o: ../../../../pikotools/src/convert/misc.h
./edb.o: ../../../../pikotools/src/textstream/stream.h
./edb.o: ../../../../pikotools/src/utf8/utf8.h
./edb.o: ../../../../pikotools/src/date/date.h
./edb.o: ../../../../pikotools/src/membuffer/membuffer.h
./edb.o: ../../../../pikotools/src/textstream/types.h
./edb.o: ../../../../pikotools/src/textstream/stream_private.h
./edb.o: ../../../../winix/winixd/core/winix_const.h
./edb.o: ../../../../pikotools/src/convert/convert.h
./edb.o: ../../../../pikotools/src/convert/inttostr.h
./edb.o: ../../../../pikotools/src/convert/patternreplacer.h
./edb.o: ../../../../pikotools/src/convert/strtoint.h
./edb.o: ../../../../pikotools/src/convert/text.h
./edb.o: ../../../../pikotools/src/convert/misc.h
./edb.o: ../../../../pikotools/src/textstream/types.h
./edb.o: ../../../../pikotools/src/convert/double.h
./edb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
./edb.o: ../../../../morm/src/ft.h ../../../../morm/src/dbconnector.h
./edb.o: ../../../../pikotools/src/log/log.h
./edb.o: ../../../../pikotools/src/log/filelog.h
./edb.o: ../../../../morm/src/queryresult.h
./edb.o: ../../../../morm/src/flatconnector.h
./edb.o: ../../../../morm/src/dbexpression.h
./edb.o: ../../../../morm/src/baseexpression.h
./edb.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
./edb.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
./edb.o: ../../../../morm/src/finderhelper.h
./edb.o: ../../../../morm/src/fieldvaluehelper.h
./edb.o: ../../../../morm/src/wrapper.h ../../../../morm/src/spacewrapper.h
./edb.o: ../../../../morm/src/baseobjectwrapper.h
./edb.o: ../../../../morm/src/modelcontainerwrapper.h
./edb.o: ../../../../morm/src/select.h ../../../../morm/src/flatexpression.h
./edb.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h exportftp.h
./edb.o: exportdir.h ../../../../winix/winixd/core/dirs.h
./edb.o: ../../../../winix/winixd/core/dircontainer.h
./edb.o: ../../../../winix/winixd/core/winixbase.h
./edb.o: ../../../../winix/winixd/core/config.h
./edb.o: ../../../../pikotools/src/space/spaceparser.h
@@ -32,29 +38,10 @@
./edb.o: ../../../../pikotools/src/convert/baseparser.h
./edb.o: ../../../../winix/winixd/core/log.h
./edb.o: ../../../../winix/winixd/core/logmanipulators.h
./edb.o: ../../../../pikotools/src/log/log.h
./edb.o: ../../../../pikotools/src/log/filelog.h
./edb.o: ../../../../winix/winixd/core/filelog.h
./edb.o: ../../../../winix/winixd/core/synchro.h ../../../../morm/src/morm.h
./edb.o: ../../../../morm/src/version.h ../../../../morm/src/morm_types.h
./edb.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
./edb.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./edb.o: ../../../../morm/src/dbconnector.h
./edb.o: ../../../../morm/src/queryresult.h
./edb.o: ../../../../morm/src/flatconnector.h export.h
./edb.o: ../../../../morm/src/dbexpression.h
./edb.o: ../../../../morm/src/baseexpression.h
./edb.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
./edb.o: ../../../../morm/src/cursorhelper.h
./edb.o: ../../../../morm/src/finderhelper.h
./edb.o: ../../../../morm/src/fieldvaluehelper.h
./edb.o: ../../../../morm/src/wrapper.h ../../../../morm/src/spacewrapper.h
./edb.o: ../../../../morm/src/baseobjectwrapper.h
./edb.o: ../../../../morm/src/modelcontainerwrapper.h
./edb.o: ../../../../morm/src/select.h ../../../../morm/src/flatexpression.h
./edb.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./edb.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
./edb.o: ../../../../morm/src/jsonexpression.h
./edb.o: ../../../../morm/src/version.h ../../../../morm/src/finder.h
./edb.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
./edb.o: ../../../../morm/src/postgresqlexpression.h
./edb.o: ../../../../morm/src/xmlexpression.h
./edb.o: ../../../../morm/src/jsonconnector.h
@@ -66,10 +53,6 @@
./edb.o: ../../../../winix/winixd/core/filelog.h
./edb.o: ../../../../winix/winixd/core/lock.h
./edb.o: ../../../../winix/winixd/core/synchro.h
./edb.o: ../../../../winix/winixd/core/error.h
./edb.o: ../../../../winix/winixd/core/dirs.h
./edb.o: ../../../../winix/winixd/core/dircontainer.h
./edb.o: ../../../../winix/winixd/core/winixbase.h
./edb.o: ../../../../winix/winixd/models/item.h
./edb.o: ../../../../winix/winixd/models/winixmodel.h
./edb.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -78,25 +61,22 @@
./edb.o: ../../../../winix/winixd/templates/misc.h
./edb.o: ../../../../winix/winixd/templates/localefilter.h
./edb.o: ../../../../winix/winixd/templates/locale.h
./edb.o: ../../../../winix/winixd/core/winixbase.h
./edb.o: ../../../../pikotools/src/convert/patternreplacer.h
./edb.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./edb.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./edb.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
./edb.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
./edb.o: ../../../../ezc/src/outstreams.h
./edb.o: ../../../../pikotools/src/convert/strtoint.h
./edb.o: ../../../../pikotools/src/convert/text.h
./edb.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
./edb.o: ../../../../ezc/src/version.h ../../../../ezc/src/generator.h
./edb.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
./edb.o: ../../../../ezc/src/functions.h ../../../../ezc/src/objects.h
./edb.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
./edb.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
./edb.o: ../../../../ezc/src/patternparser.h
./edb.o: ../../../../winix/winixd/templates/htmltextstream.h
./edb.o: ../../../../winix/winixd/db/db.h
./edb.o: ../../../../winix/winixd/db/dbbase.h
./edb.o: ../../../../winix/winixd/models/user.h
./edb.o: ../../../../winix/winixd/models/group.h
./edb.o: ../../../../winix/winixd/core/dircontainer.h
./edb.o: ../../../../winix/winixd/core/ugcontainer.h
./edb.o: ../../../../winix/winixd/core/request.h
./edb.o: ../../../../winix/winixd/core/requesttypes.h
./edb.o: ../../../../winix/winixd/core/error.h
./edb.o: ../../../../winix/winixd/core/config.h
./edb.o: ../../../../winix/winixd/core/textstream.h
./edb.o: ../../../../winix/winixd/models/winixmodel.h
./edb.o: ../../../../winix/winixd/core/header.h
./edb.o: ../../../../winix/winixd/core/compress.h
@@ -115,34 +95,27 @@
./exportinfo.o: ../../../../winix/winixd/core/synchro.h
./exportinfo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./exportinfo.o: ../../../../winix/winixd/core/winixbase.h
./exportinfo.o: ../../../../winix/winixd/core/config.h
./exportinfo.o: ../../../../pikotools/src/space/spaceparser.h
./exportinfo.o: ../../../../pikotools/src/space/space.h
./exportinfo.o: ../../../../pikotools/src/convert/baseparser.h
./exportinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./exportinfo.o: ../../../../morm/src/morm_types.h
./exportinfo.o: ../../../../morm/src/model.h
./exportinfo.o: ../../../../pikotools/src/textstream/textstream.h
./exportinfo.o: ../../../../pikotools/src/textstream/stream.h
./exportinfo.o: ../../../../pikotools/src/space/space.h
./exportinfo.o: ../../../../pikotools/src/convert/inttostr.h
./exportinfo.o: ../../../../pikotools/src/utf8/utf8.h
./exportinfo.o: ../../../../pikotools/src/convert/misc.h
./exportinfo.o: ../../../../pikotools/src/textstream/stream.h
./exportinfo.o: ../../../../pikotools/src/utf8/utf8.h
./exportinfo.o: ../../../../pikotools/src/date/date.h
./exportinfo.o: ../../../../pikotools/src/membuffer/membuffer.h
./exportinfo.o: ../../../../pikotools/src/textstream/types.h
./exportinfo.o: ../../../../pikotools/src/textstream/stream_private.h
./exportinfo.o: ../../../../winix/winixd/core/log.h
./exportinfo.o: ../../../../winix/winixd/core/logmanipulators.h
./exportinfo.o: ../../../../pikotools/src/log/log.h
./exportinfo.o: ../../../../pikotools/src/log/filelog.h
./exportinfo.o: ../../../../winix/winixd/core/filelog.h
./exportinfo.o: ../../../../winix/winixd/core/synchro.h
./exportinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./exportinfo.o: ../../../../morm/src/morm_types.h
./exportinfo.o: ../../../../morm/src/model.h
./exportinfo.o: ../../../../morm/src/modelconnector.h
./exportinfo.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./exportinfo.o: ../../../../morm/src/dbconnector.h
./exportinfo.o: ../../../../pikotools/src/log/log.h
./exportinfo.o: ../../../../pikotools/src/log/filelog.h
./exportinfo.o: ../../../../morm/src/queryresult.h
./exportinfo.o: ../../../../morm/src/flatconnector.h export.h
./exportinfo.o: ../../../../morm/src/flatconnector.h export.h exportftp.h
./exportinfo.o: ../../../../morm/src/dbexpression.h
./exportinfo.o: ../../../../morm/src/baseexpression.h
./exportinfo.o: ../../../../morm/src/modelenv.h
@@ -166,8 +139,6 @@
./exportinfo.o: ../../../../morm/src/postgresqlqueryresult.h
./exportinfo.o: ../../../../morm/src/xmlconnector.h
./exportinfo.o: ../../../../morm/src/transaction.h
./exportinfo.o: ../../../../winix/winixd/core/filelog.h
./exportinfo.o: ../../../../winix/winixd/core/lock.h
./exportinfo.o: ../../../../winix/winixd/core/jobtask.h
./exportinfo.o: ../../../../winix/winixd/core/cur.h
./exportinfo.o: ../../../../winix/winixd/core/request.h
@@ -180,7 +151,13 @@
./exportinfo.o: ../../../../winix/winixd/templates/misc.h
./exportinfo.o: ../../../../winix/winixd/templates/localefilter.h
./exportinfo.o: ../../../../winix/winixd/templates/locale.h
./exportinfo.o: ../../../../pikotools/src/space/spaceparser.h
./exportinfo.o: ../../../../pikotools/src/space/space.h
./exportinfo.o: ../../../../pikotools/src/convert/baseparser.h
./exportinfo.o: ../../../../pikotools/src/convert/patternreplacer.h
./exportinfo.o: ../../../../pikotools/src/convert/strtoint.h
./exportinfo.o: ../../../../pikotools/src/convert/text.h
./exportinfo.o: ../../../../pikotools/src/convert/misc.h
./exportinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./exportinfo.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./exportinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
@@ -192,24 +169,25 @@
./exportinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
./exportinfo.o: ../../../../winix/winixd/core/error.h
./exportinfo.o: ../../../../winix/winixd/core/config.h
./exportinfo.o: ../../../../winix/winixd/core/textstream.h
./exportinfo.o: ../../../../winix/winixd/models/winixmodel.h
./exportinfo.o: ../../../../winix/winixd/core/header.h
./exportinfo.o: ../../../../winix/winixd/core/log.h
./exportinfo.o: ../../../../winix/winixd/core/logmanipulators.h
./exportinfo.o: ../../../../winix/winixd/core/filelog.h
./exportinfo.o: ../../../../winix/winixd/core/synchro.h
./exportinfo.o: ../../../../winix/winixd/core/compress.h
./exportinfo.o: ../../../../winix/winixd/core/winixbase.h
./exportinfo.o: ../../../../winix/winixd/core/config.h
./exportinfo.o: ../../../../winix/winixd/core/filelog.h
./exportinfo.o: ../../../../winix/winixd/core/lock.h
./exportinfo.o: ../../../../winix/winixd/core/plugin.h
./exportinfo.o: ../../../../winix/winixd/core/pluginmsg.h
./exportinfo.o: ../../../../winix/winixd/core/plugindata.h
./exportinfo.o: ../../../../winix/winixd/core/mount.h
./exportinfo.o: ../../../../winix/winixd/core/mounts.h
./exportinfo.o: ../../../../winix/winixd/db/db.h
./exportinfo.o: ../../../../winix/winixd/db/dbbase.h
./exportinfo.o: ../../../../winix/winixd/models/user.h
./exportinfo.o: ../../../../winix/winixd/models/group.h
./exportinfo.o: ../../../../winix/winixd/core/dircontainer.h
./exportinfo.o: ../../../../winix/winixd/core/ugcontainer.h
./exportinfo.o: ../../../../winix/winixd/core/mountparser.h
./exportinfo.o: ../../../../winix/winixd/core/session.h
./exportinfo.o: ../../../../winix/winixd/models/user.h
./exportinfo.o: ../../../../winix/winixd/core/rebus.h
./exportinfo.o: ../../../../winix/winixd/core/ipban.h
./exportinfo.o: ../../../../winix/winixd/core/loadavg.h
@@ -224,6 +202,7 @@
./exportinfo.o: ../../../../winix/winixd/core/ugcontainer.h
./exportinfo.o: ../../../../winix/winixd/core/lastcontainer.h
./exportinfo.o: ../../../../winix/winixd/core/groups.h
./exportinfo.o: ../../../../winix/winixd/models/group.h
./exportinfo.o: ../../../../winix/winixd/core/image.h
./exportinfo.o: ../../../../winix/winixd/core/threadmanager.h
./exportinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -235,24 +214,9 @@
./exportinfo.o: ../../../../winix/winixd/notify/notifythread.h
./exportinfo.o: ../../../../winix/winixd/core/basethread.h
./exportinfo.o: ../../../../winix/winixd/notify/templatesnotify.h
./exportinfo.o: ../../../../winix/winixd/core/textstream.h
./exportinfo.o: ../../../../winix/winixd/core/misc.h
./exportinfo.o: ../../../../winix/winixd/core/winix_const.h
./exportinfo.o: ../../../../pikotools/src/convert/convert.h
./exportinfo.o: ../../../../pikotools/src/convert/inttostr.h
./exportinfo.o: ../../../../pikotools/src/convert/patternreplacer.h
./exportinfo.o: ../../../../pikotools/src/convert/strtoint.h
./exportinfo.o: ../../../../pikotools/src/convert/text.h
./exportinfo.o: ../../../../pikotools/src/convert/misc.h
./exportinfo.o: ../../../../pikotools/src/textstream/types.h
./exportinfo.o: ../../../../pikotools/src/convert/double.h
./exportinfo.o: ../../../../winix/winixd/core/users.h
./exportinfo.o: ../../../../winix/winixd/core/timezones.h
./exportinfo.o: ../../../../winix/winixd/core/timezone.h edb.h
./exportinfo.o: ../../../../winix/winixd/db/dbbase.h
./exportinfo.o: ../../../../winix/winixd/db/dbconn.h
./exportinfo.o: ../../../../winix/winixd/db/dbtextstream.h
./exportinfo.o: ../../../../winix/winixd/core/error.h
./exportinfo.o: ../../../../winix/winixd/core/timezone.h edb.h exportdir.h
./exportinfo.o: ../../../../winix/winixd/core/dirs.h message.h exportthread.h
./exportinfo.o: ../../../../pikotools/src/convert/text.h
./exportthread.o: exportthread.h ../../../../winix/winixd/core/basethread.h
@@ -263,8 +227,9 @@
./exportthread.o: ../../../../pikotools/src/textstream/stream.h
./exportthread.o: ../../../../pikotools/src/space/space.h
./exportthread.o: ../../../../pikotools/src/convert/inttostr.h
./exportthread.o: ../../../../pikotools/src/utf8/utf8.h
./exportthread.o: ../../../../pikotools/src/convert/misc.h
./exportthread.o: ../../../../pikotools/src/textstream/stream.h
./exportthread.o: ../../../../pikotools/src/utf8/utf8.h
./exportthread.o: ../../../../pikotools/src/date/date.h
./exportthread.o: ../../../../pikotools/src/membuffer/membuffer.h
./exportthread.o: ../../../../pikotools/src/textstream/types.h
@@ -276,34 +241,40 @@
./exportthread.o: ../../../../pikotools/src/convert/strtoint.h
./exportthread.o: ../../../../pikotools/src/convert/text.h
./exportthread.o: ../../../../pikotools/src/convert/misc.h
./exportthread.o: ../../../../pikotools/src/textstream/types.h
./exportthread.o: ../../../../pikotools/src/convert/double.h
./exportthread.o: ../../../../pikotools/src/convert/text.h
./funexport.o: funexport.h ../../../../winix/winixd/functions/functionbase.h
./funexport.o: ../../../../winix/winixd/db/db.h
./funexport.o: ../../../../winix/winixd/db/dbbase.h
./funexport.o: ../../../../winix/winixd/models/user.h
./funexport.o: ../../../../morm/src/model.h
./funexport.o: ../../../../winix/winixd/core/request.h
./funexport.o: ../../../../winix/winixd/core/config.h
./funexport.o: ../../../../pikotools/src/space/spaceparser.h
./funexport.o: ../../../../pikotools/src/space/space.h
./funexport.o: ../../../../pikotools/src/convert/baseparser.h
./funexport.o: ../../../../pikotools/src/textstream/textstream.h
./funexport.o: ../../../../pikotools/src/textstream/stream.h
./funexport.o: ../../../../pikotools/src/space/space.h
./funexport.o: ../../../../pikotools/src/convert/inttostr.h
./funexport.o: ../../../../pikotools/src/utf8/utf8.h
./funexport.o: ../../../../pikotools/src/convert/misc.h
./funexport.o: ../../../../pikotools/src/textstream/stream.h
./funexport.o: ../../../../pikotools/src/utf8/utf8.h
./funexport.o: ../../../../pikotools/src/date/date.h
./funexport.o: ../../../../pikotools/src/membuffer/membuffer.h
./funexport.o: ../../../../pikotools/src/textstream/types.h
./funexport.o: ../../../../pikotools/src/textstream/stream_private.h
./funexport.o: ../../../../winix/winixd/core/log.h
./funexport.o: ../../../../winix/winixd/core/logmanipulators.h
./funexport.o: ../../../../pikotools/src/log/log.h
./funexport.o: ../../../../pikotools/src/log/filelog.h
./funexport.o: ../../../../winix/winixd/core/filelog.h
./funexport.o: ../../../../winix/winixd/core/synchro.h
./funexport.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./funexport.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
./funexport.o: ../../../../morm/src/modelconnector.h
./funexport.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./funexport.o: ../../../../morm/src/dbconnector.h
./funexport.o: ../../../../pikotools/src/log/log.h
./funexport.o: ../../../../pikotools/src/log/filelog.h
./funexport.o: ../../../../morm/src/queryresult.h
./funexport.o: ../../../../morm/src/flatconnector.h export.h
./funexport.o: ../../../../morm/src/flatconnector.h export.h exportftp.h
./funexport.o: ../../../../morm/src/dbexpression.h
./funexport.o: ../../../../morm/src/baseexpression.h
./funexport.o: ../../../../morm/src/morm_types.h
./funexport.o: ../../../../morm/src/modelenv.h
./funexport.o: ../../../../morm/src/modeldata.h
./funexport.o: ../../../../morm/src/cursorhelper.h
@@ -316,19 +287,6 @@
./funexport.o: ../../../../morm/src/select.h
./funexport.o: ../../../../morm/src/flatexpression.h
./funexport.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./funexport.o: ../../../../winix/winixd/templates/misc.h
./funexport.o: ../../../../winix/winixd/templates/localefilter.h
./funexport.o: ../../../../winix/winixd/templates/locale.h
./funexport.o: ../../../../pikotools/src/space/spaceparser.h
./funexport.o: ../../../../pikotools/src/space/space.h
./funexport.o: ../../../../pikotools/src/convert/baseparser.h
./funexport.o: ../../../../winix/winixd/core/winixbase.h
./funexport.o: ../../../../winix/winixd/core/config.h
./funexport.o: ../../../../winix/winixd/core/log.h
./funexport.o: ../../../../winix/winixd/core/logmanipulators.h
./funexport.o: ../../../../winix/winixd/core/filelog.h
./funexport.o: ../../../../winix/winixd/core/synchro.h
./funexport.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./funexport.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
./funexport.o: ../../../../morm/src/jsonexpression.h
./funexport.o: ../../../../morm/src/postgresqlexpression.h
@@ -338,11 +296,18 @@
./funexport.o: ../../../../morm/src/postgresqlqueryresult.h
./funexport.o: ../../../../morm/src/xmlconnector.h
./funexport.o: ../../../../morm/src/transaction.h
./funexport.o: ../../../../winix/winixd/core/log.h
./funexport.o: ../../../../winix/winixd/core/filelog.h
./funexport.o: ../../../../winix/winixd/core/lock.h
./funexport.o: ../../../../winix/winixd/core/synchro.h
./funexport.o: ../../../../winix/winixd/notify/notify.h
./funexport.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./funexport.o: ../../../../winix/winixd/notify/notifypool.h
./funexport.o: ../../../../winix/winixd/templates/locale.h
./funexport.o: ../../../../winix/winixd/templates/patterns.h
./funexport.o: ../../../../winix/winixd/templates/locale.h
./funexport.o: ../../../../winix/winixd/core/winixbase.h
./funexport.o: ../../../../pikotools/src/convert/patternreplacer.h
./funexport.o: ../../../../pikotools/src/convert/strtoint.h
./funexport.o: ../../../../pikotools/src/convert/text.h
./funexport.o: ../../../../pikotools/src/convert/misc.h
./funexport.o: ../../../../winix/winixd/templates/localefilter.h
./funexport.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./funexport.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./funexport.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
@@ -351,54 +316,38 @@
./funexport.o: ../../../../ezc/src/expressionparser.h
./funexport.o: ../../../../ezc/src/models.h
./funexport.o: ../../../../ezc/src/patternparser.h
./funexport.o: ../../../../winix/winixd/templates/htmltextstream.h
./funexport.o: ../../../../winix/winixd/models/winixmodel.h
./funexport.o: ../../../../winix/winixd/models/winixmodelconnector.h
./funexport.o: ../../../../winix/winixd/models/group.h
./funexport.o: ../../../../winix/winixd/core/dircontainer.h
./funexport.o: ../../../../winix/winixd/core/ugcontainer.h
./funexport.o: ../../../../winix/winixd/core/winixbase.h
./funexport.o: ../../../../winix/winixd/core/request.h
./funexport.o: ../../../../winix/winixd/notify/notify.h
./funexport.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./funexport.o: ../../../../winix/winixd/notify/notifypool.h
./funexport.o: ../../../../winix/winixd/templates/locale.h
./funexport.o: ../../../../winix/winixd/templates/patterns.h
./funexport.o: ../../../../winix/winixd/templates/misc.h
./funexport.o: ../../../../winix/winixd/notify/notifythread.h
./funexport.o: ../../../../winix/winixd/core/basethread.h
./funexport.o: ../../../../winix/winixd/notify/templatesnotify.h
./funexport.o: ../../../../winix/winixd/core/textstream.h
./funexport.o: ../../../../winix/winixd/core/misc.h
./funexport.o: ../../../../winix/winixd/core/requesttypes.h
./funexport.o: ../../../../winix/winixd/core/winix_const.h
./funexport.o: ../../../../pikotools/src/convert/convert.h
./funexport.o: ../../../../pikotools/src/convert/inttostr.h
./funexport.o: ../../../../pikotools/src/convert/patternreplacer.h
./funexport.o: ../../../../pikotools/src/convert/strtoint.h
./funexport.o: ../../../../pikotools/src/convert/text.h
./funexport.o: ../../../../pikotools/src/convert/misc.h
./funexport.o: ../../../../pikotools/src/textstream/types.h
./funexport.o: ../../../../pikotools/src/convert/double.h
./funexport.o: ../../../../winix/winixd/core/users.h
./funexport.o: ../../../../winix/winixd/core/filelog.h
./funexport.o: ../../../../winix/winixd/core/winixrequest.h
./funexport.o: ../../../../winix/winixd/core/winixsystem.h
./funexport.o: ../../../../winix/winixd/core/system.h
./funexport.o: ../../../../winix/winixd/core/job.h
./funexport.o: ../../../../winix/winixd/core/basethread.h
./funexport.o: ../../../../winix/winixd/core/synchro.h
./funexport.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./funexport.o: ../../../../winix/winixd/core/jobtask.h
./funexport.o: ../../../../winix/winixd/core/cur.h
./funexport.o: ../../../../winix/winixd/core/request.h
./funexport.o: ../../../../winix/winixd/core/requesttypes.h
./funexport.o: ../../../../winix/winixd/models/item.h
./funexport.o: ../../../../winix/winixd/models/winixmodel.h
./funexport.o: ../../../../winix/winixd/core/log.h
./funexport.o: ../../../../winix/winixd/models/winixmodelconnector.h
./funexport.o: ../../../../winix/winixd/models/itemcontent.h
./funexport.o: ../../../../winix/winixd/templates/htmltextstream.h
./funexport.o: ../../../../winix/winixd/templates/misc.h
./funexport.o: ../../../../winix/winixd/templates/htmltextstream.h
./funexport.o: ../../../../winix/winixd/core/error.h
./funexport.o: ../../../../winix/winixd/core/config.h
./funexport.o: ../../../../winix/winixd/core/textstream.h
./funexport.o: ../../../../winix/winixd/models/winixmodel.h
./funexport.o: ../../../../winix/winixd/core/header.h
./funexport.o: ../../../../winix/winixd/core/compress.h
./funexport.o: ../../../../winix/winixd/core/winixbase.h
./funexport.o: ../../../../winix/winixd/core/lock.h
./funexport.o: ../../../../winix/winixd/core/plugin.h
./funexport.o: ../../../../winix/winixd/core/pluginmsg.h
./funexport.o: ../../../../winix/winixd/core/plugindata.h
@@ -406,6 +355,7 @@
./funexport.o: ../../../../winix/winixd/core/mounts.h
./funexport.o: ../../../../winix/winixd/core/mountparser.h
./funexport.o: ../../../../winix/winixd/core/session.h
./funexport.o: ../../../../winix/winixd/models/user.h
./funexport.o: ../../../../winix/winixd/core/rebus.h
./funexport.o: ../../../../winix/winixd/core/ipban.h
./funexport.o: ../../../../winix/winixd/core/loadavg.h
@@ -418,6 +368,7 @@
./funexport.o: ../../../../winix/winixd/core/ugcontainer.h
./funexport.o: ../../../../winix/winixd/core/lastcontainer.h
./funexport.o: ../../../../winix/winixd/core/groups.h
./funexport.o: ../../../../winix/winixd/models/group.h
./funexport.o: ../../../../winix/winixd/core/image.h
./funexport.o: ../../../../winix/winixd/core/threadmanager.h
./funexport.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -429,11 +380,7 @@
./funexport.o: ../../../../winix/winixd/core/ipbancontainer.h
./funexport.o: ../../../../winix/winixd/core/sessionidmanager.h
./funexport.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./funexport.o: ../../../../winix/winixd/core/slog.h exportinfo.h edb.h
./funexport.o: ../../../../winix/winixd/db/dbbase.h
./funexport.o: ../../../../winix/winixd/db/dbconn.h
./funexport.o: ../../../../winix/winixd/db/dbtextstream.h
./funexport.o: ../../../../winix/winixd/core/error.h
./funexport.o: exportinfo.h edb.h exportdir.h
./funexport.o: ../../../../winix/winixd/core/dirs.h message.h exportthread.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/plugin.h
@@ -441,32 +388,26 @@
./init.o: ../../../../winix/winixd/core/plugindata.h
./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
./init.o: ../../../../pikotools/src/textstream/textstream.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/date/date.h
./init.o: ../../../../pikotools/src/membuffer/membuffer.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../pikotools/src/textstream/stream_private.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/logmanipulators.h
./init.o: ../../../../pikotools/src/log/log.h
./init.o: ../../../../pikotools/src/log/filelog.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/synchro.h ../../../../morm/src/morm.h
./init.o: ../../../../morm/src/version.h ../../../../morm/src/morm_types.h
./init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
./init.o: ../../../../morm/src/modelconnector.h
./init.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./init.o: ../../../../morm/src/dbconnector.h
./init.o: ../../../../pikotools/src/log/log.h
./init.o: ../../../../pikotools/src/log/filelog.h
./init.o: ../../../../morm/src/queryresult.h
./init.o: ../../../../morm/src/flatconnector.h export.h
./init.o: ../../../../morm/src/flatconnector.h export.h exportftp.h
./init.o: ../../../../morm/src/dbexpression.h
./init.o: ../../../../morm/src/baseexpression.h
./init.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
@@ -487,14 +428,12 @@
./init.o: ../../../../morm/src/postgresqlqueryresult.h
./init.o: ../../../../morm/src/xmlconnector.h
./init.o: ../../../../morm/src/transaction.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/lock.h
./init.o: ../../../../winix/winixd/core/synchro.h
./init.o: ../../../../winix/winixd/core/mount.h exportthread.h
./init.o: ../../../../winix/winixd/core/basethread.h message.h exportinfo.h
./init.o: ../../../../winix/winixd/core/system.h
./init.o: ../../../../winix/winixd/core/job.h
./init.o: ../../../../winix/winixd/core/basethread.h
./init.o: ../../../../winix/winixd/core/synchro.h
./init.o: ../../../../winix/winixd/core/jobtask.h
./init.o: ../../../../winix/winixd/core/cur.h
./init.o: ../../../../winix/winixd/core/request.h
@@ -507,32 +446,38 @@
./init.o: ../../../../winix/winixd/templates/misc.h
./init.o: ../../../../winix/winixd/templates/localefilter.h
./init.o: ../../../../winix/winixd/templates/locale.h
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./init.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
./init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
./init.o: ../../../../ezc/src/outstreams.h
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
./init.o: ../../../../ezc/src/version.h ../../../../ezc/src/generator.h
./init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
./init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/objects.h
./init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
./init.o: ../../../../ezc/src/patternparser.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/core/header.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/logmanipulators.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/synchro.h
./init.o: ../../../../winix/winixd/core/compress.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/lock.h
./init.o: ../../../../winix/winixd/core/plugin.h
./init.o: ../../../../winix/winixd/core/mounts.h
./init.o: ../../../../winix/winixd/db/db.h
./init.o: ../../../../winix/winixd/db/dbbase.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/dircontainer.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/mountparser.h
./init.o: ../../../../winix/winixd/core/session.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/core/rebus.h
./init.o: ../../../../winix/winixd/core/ipban.h
./init.o: ../../../../winix/winixd/core/loadavg.h
@@ -547,6 +492,7 @@
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/lastcontainer.h
./init.o: ../../../../winix/winixd/core/groups.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/image.h
./init.o: ../../../../winix/winixd/core/threadmanager.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -557,24 +503,9 @@
./init.o: ../../../../winix/winixd/templates/misc.h
./init.o: ../../../../winix/winixd/notify/notifythread.h
./init.o: ../../../../winix/winixd/notify/templatesnotify.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/core/misc.h
./init.o: ../../../../winix/winixd/core/winix_const.h
./init.o: ../../../../pikotools/src/convert/convert.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../pikotools/src/convert/double.h
./init.o: ../../../../winix/winixd/core/users.h
./init.o: ../../../../winix/winixd/core/timezones.h
./init.o: ../../../../winix/winixd/core/timezone.h edb.h
./init.o: ../../../../winix/winixd/db/dbbase.h
./init.o: ../../../../winix/winixd/db/dbconn.h
./init.o: ../../../../winix/winixd/db/dbtextstream.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/core/timezone.h edb.h exportdir.h
./init.o: ../../../../winix/winixd/core/dirs.h funexport.h
./init.o: ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/core/winixrequest.h
@@ -585,7 +516,6 @@
./init.o: ../../../../winix/winixd/core/ipbancontainer.h
./init.o: ../../../../winix/winixd/core/sessionidmanager.h
./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./init.o: ../../../../winix/winixd/core/slog.h
./init.o: ../../../../winix/winixd/functions/functions.h
./init.o: ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/functions/functionparser.h
@@ -638,3 +568,72 @@
./init.o: ../../../../winix/winixd/functions/who.h
./init.o: ../../../../winix/winixd/functions/vim.h
./init.o: ../../../../pikotools/src/html/htmlparser.h
./init.o: ../../../../winix/winixd/models/migration.h
./export.o: export.h ../../../../morm/src/model.h
./export.o: ../../../../pikotools/src/textstream/textstream.h
./export.o: ../../../../pikotools/src/textstream/stream.h
./export.o: ../../../../pikotools/src/space/space.h
./export.o: ../../../../pikotools/src/convert/inttostr.h
./export.o: ../../../../pikotools/src/convert/misc.h
./export.o: ../../../../pikotools/src/textstream/stream.h
./export.o: ../../../../pikotools/src/utf8/utf8.h
./export.o: ../../../../pikotools/src/date/date.h
./export.o: ../../../../pikotools/src/membuffer/membuffer.h
./export.o: ../../../../pikotools/src/textstream/types.h
./export.o: ../../../../pikotools/src/textstream/stream_private.h
./export.o: ../../../../morm/src/modelconnector.h
./export.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./export.o: ../../../../morm/src/dbconnector.h
./export.o: ../../../../pikotools/src/log/log.h
./export.o: ../../../../pikotools/src/log/filelog.h
./export.o: ../../../../morm/src/queryresult.h
./export.o: ../../../../morm/src/flatconnector.h
./export.o: ../../../../morm/src/dbexpression.h
./export.o: ../../../../morm/src/baseexpression.h
./export.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
./export.o: ../../../../morm/src/modeldata.h
./export.o: ../../../../morm/src/cursorhelper.h
./export.o: ../../../../morm/src/finderhelper.h
./export.o: ../../../../morm/src/fieldvaluehelper.h
./export.o: ../../../../morm/src/wrapper.h
./export.o: ../../../../morm/src/spacewrapper.h
./export.o: ../../../../morm/src/baseobjectwrapper.h
./export.o: ../../../../morm/src/modelcontainerwrapper.h
./export.o: ../../../../morm/src/select.h
./export.o: ../../../../morm/src/flatexpression.h
./export.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./export.o: exportftp.h
./exportftp.o: exportftp.h ../../../../morm/src/model.h
./exportftp.o: ../../../../pikotools/src/textstream/textstream.h
./exportftp.o: ../../../../pikotools/src/textstream/stream.h
./exportftp.o: ../../../../pikotools/src/space/space.h
./exportftp.o: ../../../../pikotools/src/convert/inttostr.h
./exportftp.o: ../../../../pikotools/src/convert/misc.h
./exportftp.o: ../../../../pikotools/src/textstream/stream.h
./exportftp.o: ../../../../pikotools/src/utf8/utf8.h
./exportftp.o: ../../../../pikotools/src/date/date.h
./exportftp.o: ../../../../pikotools/src/membuffer/membuffer.h
./exportftp.o: ../../../../pikotools/src/textstream/types.h
./exportftp.o: ../../../../pikotools/src/textstream/stream_private.h
./exportftp.o: ../../../../morm/src/modelconnector.h
./exportftp.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./exportftp.o: ../../../../morm/src/dbconnector.h
./exportftp.o: ../../../../pikotools/src/log/log.h
./exportftp.o: ../../../../pikotools/src/log/filelog.h
./exportftp.o: ../../../../morm/src/queryresult.h
./exportftp.o: ../../../../morm/src/flatconnector.h export.h
./exportftp.o: ../../../../morm/src/dbexpression.h
./exportftp.o: ../../../../morm/src/baseexpression.h
./exportftp.o: ../../../../morm/src/morm_types.h
./exportftp.o: ../../../../morm/src/modelenv.h
./exportftp.o: ../../../../morm/src/modeldata.h
./exportftp.o: ../../../../morm/src/cursorhelper.h
./exportftp.o: ../../../../morm/src/finderhelper.h
./exportftp.o: ../../../../morm/src/fieldvaluehelper.h
./exportftp.o: ../../../../morm/src/wrapper.h
./exportftp.o: ../../../../morm/src/spacewrapper.h
./exportftp.o: ../../../../morm/src/baseobjectwrapper.h
./exportftp.o: ../../../../morm/src/modelcontainerwrapper.h
./exportftp.o: ../../../../morm/src/select.h
./exportftp.o: ../../../../morm/src/flatexpression.h
./exportftp.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,203 +35,63 @@
#include "edb.h"
#include "core/log.h"
namespace Winix
{
namespace Export
{
void EDb::SetDirs(Dirs * pdirs)
{
dirs = pdirs;
}
void EDb::SetExportCols(PGresult * r)
void EDb::GetExport(morm::ModelConnector * model_connector, long user_id, std::vector<Export> & export_tab)
{
cid = AssertColumn(r, "id");
cuser_id = AssertColumn(r, "user_id");
cdir = AssertColumn(r, "dir");
cftp_id = AssertColumn(r, "ftp_id");
cftp_dir = AssertColumn(r, "ftp_dir");
cname = AssertColumn(r, "name");
cserver = AssertColumn(r, "server");
clogin = AssertColumn(r, "login");
cpass = AssertColumn(r, "pass");
cpass_type = AssertColumn(r, "pass_type");
morm::Finder<Export> finder(model_connector);
ccan_change_ftp_params = AssertColumn(r, "can_change_ftp_params");
ccan_change_dir = AssertColumn(r, "can_change_dir");
chttp_server = AssertColumn(r, "http_server");
finder.select().where().eq(L"user_id", user_id).get_vector(export_tab);
}
void EDb::SetExportValues(PGresult * r, int row, Export & exp)
void EDb::GetExport(morm::ModelConnector * model_connector, long id, Export & exp)
{
exp.Clear();
morm::Finder<Export> finder(model_connector);
exp.id = AssertValueLong(r, row, cid);
exp.user_id = AssertValueLong(r, row, cuser_id);
exp.ftp_id = AssertValueLong(r, row, cftp_id);
exp.ftp_pass_type = AssertValueInt(r, row, cpass_type);
AssertValueWide(r, row, cdir, exp.dir);
AssertValueWide(r, row, cftp_dir, exp.ftp_dir);
AssertValueWide(r, row, cname, exp.ftp_name);
AssertValueWide(r, row, cserver, exp.ftp_server);
AssertValueWide(r, row, clogin, exp.ftp_login);
AssertValueWide(r, row, chttp_server, exp.http_server);
AssertValueWide(r, row, cpass, exp.ftp_pass);
exp.can_change_ftp_params = AssertValueBool(r, row, ccan_change_ftp_params);
exp.can_change_dir = AssertValueBool(r, row, ccan_change_dir);
finder.select().where().eq(L"id", id).get(exp);
}
bool EDb::GetExport(long user_id, std::vector<Export> & export_tab, bool clear_tab)
void EDb::GetExportDirs(morm::ModelConnector * model_connector, std::vector<ExportDir> & export_tab, bool clear_tab)
{
if( clear_tab )
export_tab.clear();
PGresult * r = 0;
bool result = true;
std::vector<Export> exports;
morm::Finder<Export> finder(model_connector);
finder.select().get_vector(exports);
try
for(size_t i=0 ; i < exports.size() ; ++i)
{
query.Clear();
query << R( "select export.id, user_id, dir, ftp_id, ftp_dir, can_change_ftp_params, can_change_dir, "
"http_server, name, server, login, pass, pass_type from plugins.export "
"left join plugins.export_ftp on ftp_id = export_ftp.id where user_id = ")
<< user_id
<< R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
Item * pdir = dirs->GetDir(exports[i].dir);
SetExportCols(r);
int rows = Rows(r);
for(int i=0 ; i<rows ; ++i)
if( pdir )
{
SetExportValues(r, i, exp);
export_tab.push_back(exp);
exp_dir.id = exports[i].id;
exp_dir.dir_id = pdir->id;
export_tab.push_back(exp_dir);
}
else
{
//slog << "There is not such a directory: " << dir_temp << " (skipping)" << logend;
}
}
catch(const Error &)
{
result = false;
}
ClearResult(r);
return result;
}
bool EDb::GetExport(long id, Export & exp)
{
exp.Clear();
PGresult * r = 0;
bool result = false;
try
{
query.Clear();
query << R( "select export.id, user_id, dir, ftp_id, ftp_dir, can_change_ftp_params, can_change_dir, "
"http_server, name, server, login, pass, pass_type from plugins.export "
"left join plugins.export_ftp on ftp_id = export_ftp.id where export.id = ")
<< id
<< R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
SetExportCols(r);
if( Rows(r) == 1 )
{
SetExportValues(r, 0, exp);
result = true;
}
}
catch(const Error &)
{
}
ClearResult(r);
return result;
}
bool EDb::GetExportDirs(std::vector<ExportDir> & export_tab, bool clear_tab)
{
if( clear_tab )
export_tab.clear();
PGresult * r = 0;
bool result = true;
try
{
query.Clear();
query << R( "select export.id, dir from plugins.export;");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
int rows = Rows(r);
cid = AssertColumn(r, "id");
cdir = AssertColumn(r, "dir");
for(int i=0 ; i<rows ; ++i)
{
exp_dir.id = AssertValueLong(r, i, cid);
AssertValueWide(r, i, cdir, dir_temp);
Item * pdir = dirs->GetDir(dir_temp);
if( pdir )
{
exp_dir.dir_id = pdir->id;
export_tab.push_back(exp_dir);
}
else
{
//slog << "There is not such a directory: " << dir_temp << " (skipping)" << logend;
}
}
}
catch(const Error &)
{
result = false;
}
ClearResult(r);
return result;
}
}
} // namespace Winix

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,28 +36,24 @@
#define headerfile_winix_plugins_export_edb
#include <vector>
#include "db/dbbase.h"
#include "export.h"
#include "exportdir.h"
#include "core/dirs.h"
namespace Winix
namespace Winix::Export
{
namespace Export
{
class EDb : public DbBase
class EDb
{
public:
void SetDirs(Dirs * pdirs);
bool GetExport(long user_id, std::vector<Export> & export_tab, bool clear_tab = true);
bool GetExport(long id, Export & exp);
bool GetExportDirs(std::vector<ExportDir> & export_tab, bool clear_tab = true);
void GetExport(morm::ModelConnector * model_connector, long user_id, std::vector<Export> & export_tab);
void GetExport(morm::ModelConnector * model_connector, long id, Export & exp);
void GetExportDirs(morm::ModelConnector * model_connector, std::vector<ExportDir> & export_tab, bool clear_tab = true);
private:
@@ -65,31 +61,11 @@ private:
Export exp;
ExportDir exp_dir;
DbTextStream query;
std::wstring dir_temp;
int cid;
int cuser_id;
int cdir;
int cftp_id;
int cftp_dir;
int cname;
int cserver;
int clogin;
int cpass;
int cpass_type;
int ccan_change_ftp_params;
int ccan_change_dir;
int chttp_server;
void SetExportCols(PGresult * r);
void SetExportValues(PGresult * r, int row, Export & exp);
};
}
} // namespace Winix
#endif

View File

@@ -0,0 +1,122 @@
/*
* This file is a part of Winix
* and is distributed under the 2-Clause BSD licence.
* Author: Tomasz Sowa <t.sowa@ttmath.org>
*/
/*
* Copyright (c) 2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "export.h"
namespace Winix::Export
{
void Export::fields()
{
field(L"id", id, morm::FT::no_insertable | morm::FT::no_updatable | morm::FT::primary_key);
field(L"user_id", user_id);
field(L"dir", dir);
field(L"ftp_id", export_ftp, morm::FT::foreign_key);
field(L"ftp_dir", ftp_dir);
field(L"can_change_ftp_params", can_change_ftp_params);
field(L"can_change_dir", can_change_dir);
field(L"http_server", http_server);
}
void Export::after_insert()
{
get_last_sequence_for_primary_key(L"plugins.export_id_seq", id);
}
void Export::table()
{
table_name(L"plugins", L"export");
}
bool Export::do_migration(int & current_table_version)
{
bool ok = true;
ok = ok && morm::Model::do_migration(current_table_version, 1, this, &Export::do_migration_to_1);
ok = ok && morm::Model::do_migration(current_table_version, 2, this, &Export::do_migration_to_2);
return ok;
}
bool Export::do_migration_to_1()
{
const char * str = R"sql(
CREATE SEQUENCE plugins.export_id_seq
INCREMENT BY 1
MINVALUE 1
MAXVALUE 9223372036854775807
START WITH 1
CACHE 1
NO CYCLE
OWNED BY NONE;
)sql";
return db_query(str);
}
bool Export::do_migration_to_2()
{
const char * str = R"sql(
CREATE TABLE plugins.export (
id integer NOT NULL DEFAULT nextval('export_id_seq'::regclass),
user_id bigint,
dir character varying(1024),
ftp_id bigint,
ftp_dir character varying(1024),
can_change_ftp_params boolean,
can_change_dir boolean,
http_server character varying(1024),
CONSTRAINT export_pkey PRIMARY KEY (id)
);
)sql";
return db_query(str);
}
}

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,67 +36,43 @@
#define headerfile_winix_plugins_export_export
#include <string>
#include "model.h"
#include "exportftp.h"
namespace Winix
{
namespace Export
{
struct ExportDir
class Export : public morm::Model
{
long id;
long dir_id;
};
public:
struct Export
{
long id;
long user_id;
std::wstring dir;
long ftp_id;
ExportFtp export_ftp;
std::wstring ftp_dir;
std::wstring ftp_name;
std::wstring ftp_server;
std::wstring ftp_login;
std::wstring ftp_pass;
int ftp_pass_type;
bool can_change_ftp_params;
bool can_change_dir;
std::wstring http_server;
Export()
{
Clear();
}
void table();
void Clear()
{
id = user_id = ftp_id = -1;
ftp_pass_type = 0;
dir.clear();
ftp_dir.clear();
ftp_name.clear();
ftp_server.clear();
ftp_login.clear();
ftp_pass.clear();
protected:
can_change_ftp_params = false;
can_change_dir = false;
void fields();
void after_insert();
bool do_migration(int & current_table_version);
bool do_migration_to_1();
bool do_migration_to_2();
http_server.clear();
}
};

View File

@@ -0,0 +1,54 @@
/*
* This file is a part of Winix
* and is distributed under the 2-Clause BSD licence.
* Author: Tomasz Sowa <t.sowa@ttmath.org>
*/
/*
* Copyright (c) 2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef headerfile_winix_plugins_export_exportdir
#define headerfile_winix_plugins_export_exportdir
namespace Winix::Export
{
struct ExportDir
{
long id;
long dir_id;
};
}
#endif

View File

@@ -0,0 +1,113 @@
/*
* This file is a part of Winix
* and is distributed under the 2-Clause BSD licence.
* Author: Tomasz Sowa <t.sowa@ttmath.org>
*/
/*
* Copyright (c) 2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "exportftp.h"
namespace Winix::Export
{
void ExportFtp::fields()
{
field(L"id", id, morm::FT::no_insertable | morm::FT::no_updatable | morm::FT::primary_key);
field(L"name", name);
field(L"server", server);
field(L"login", login);
field(L"pass", pass);
field(L"pass_type", pass_type);
}
void ExportFtp::after_insert()
{
get_last_sequence_for_primary_key(L"plugins.export_ftp_id_seq", id);
}
void ExportFtp::table()
{
table_name(L"plugins", L"export_ftp");
}
bool ExportFtp::do_migration(int & current_table_version)
{
bool ok = true;
ok = ok && morm::Model::do_migration(current_table_version, 1, this, &ExportFtp::do_migration_to_1);
ok = ok && morm::Model::do_migration(current_table_version, 2, this, &ExportFtp::do_migration_to_2);
return ok;
}
bool ExportFtp::do_migration_to_1()
{
const char * str = R"sql(
CREATE SEQUENCE plugins.export_ftp_id_seq
INCREMENT BY 1
MINVALUE 1
MAXVALUE 9223372036854775807
START WITH 1
CACHE 1
NO CYCLE
OWNED BY NONE;
)sql";
return db_query(str);
}
bool ExportFtp::do_migration_to_2()
{
const char * str = R"sql(
CREATE TABLE plugins.export_ftp (
id integer NOT NULL DEFAULT nextval('export_ftp_id_seq'::regclass),
name character varying(256),
server character varying(1024),
login character varying(1024),
pass character varying(1024),
pass_type integer,
CONSTRAINT export_ftp_pkey PRIMARY KEY (id)
);
)sql";
return db_query(str);
}
}

View File

@@ -0,0 +1,78 @@
/*
* This file is a part of Winix
* and is distributed under the 2-Clause BSD licence.
* Author: Tomasz Sowa <t.sowa@ttmath.org>
*/
/*
* Copyright (c) 2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef headerfile_winix_plugins_export_exportftp
#define headerfile_winix_plugins_export_exportftp
#include <string>
#include "model.h"
namespace Winix::Export
{
class ExportFtp : public morm::Model
{
public:
long id;
std::wstring name;
std::wstring server;
std::wstring login;
std::wstring pass;
int pass_type;
void table();
protected:
void fields();
void after_insert();
bool do_migration(int & current_table_version);
bool do_migration_to_1();
bool do_migration_to_2();
};
}
#endif

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2021, Tomasz Sowa
* Copyright (c) 2011-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,12 +72,6 @@ void ExportInfo::SetEDb(EDb * pdb)
}
void ExportInfo::SetDb(Db * pdb)
{
db = pdb;
}
void ExportInfo::SetExportThread(ExportThread * pexport_thread)
{
export_thread = pexport_thread;
@@ -87,7 +81,7 @@ void ExportInfo::SetExportThread(ExportThread * pexport_thread)
void ExportInfo::ReadExportDirs()
{
edb->GetExportDirs(export_dirs);
edb->GetExportDirs(model_connector, export_dirs);
}
@@ -114,7 +108,7 @@ return 0;
bool ExportInfo::DecodePass(Export & exp)
{
if( exp.ftp_pass_type == 0 )
if( exp.export_ftp.pass_type == 0 )
{
}
@@ -210,13 +204,15 @@ void ExportInfo::SendFile(const Item & item, bool thumb, bool put_to_recurrence_
msg.errors = 0;
if( SkipDir(exp_dir->dir_id, msg.path) && edb->GetExport(exp_dir->id, exp) )
if( SkipDir(exp_dir->dir_id, msg.path) )
{
if( DecodePass(exp) )
edb->GetExport(model_connector, exp_dir->id, exp);
if( exp.found() && DecodePass(exp) )
{
msg.ftp_login = exp.ftp_login;
msg.ftp_pass = exp.ftp_pass;
msg.ftp_server = exp.ftp_server;
msg.ftp_login = exp.export_ftp.login;
msg.ftp_pass = exp.export_ftp.pass;
msg.ftp_server = exp.export_ftp.server;
msg.http_server = exp.http_server;
system->dirs.MakePath(exp_dir->dir_id, msg.src_dir);
@@ -262,13 +258,15 @@ void ExportInfo::SendDir(const Item & item)
msg.errors = 0;
if( SkipDir(exp_dir->dir_id, msg.path) && edb->GetExport(exp_dir->id, exp) )
if( SkipDir(exp_dir->dir_id, msg.path) )
{
if( DecodePass(exp) )
edb->GetExport(model_connector, exp_dir->id, exp);
if( exp.found() && DecodePass(exp) )
{
msg.ftp_login = exp.ftp_login;
msg.ftp_pass = exp.ftp_pass;
msg.ftp_server = exp.ftp_server;
msg.ftp_login = exp.export_ftp.login;
msg.ftp_pass = exp.export_ftp.pass;
msg.ftp_server = exp.export_ftp.server;
msg.http_server = exp.http_server;
system->dirs.MakePath(exp_dir->dir_id, msg.src_dir);

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2021, Tomasz Sowa
* Copyright (c) 2011-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,6 @@
#define headerfile_winix_plugins_export_exportinfo
#include "core/system.h"
#include "db/db.h"
#include "export.h"
#include "edb.h"
#include "message.h"
@@ -61,7 +60,6 @@ public:
void SetSystem(System * psystem);
void SetConfig(Config * pconfig);
void SetEDb(EDb * pdb);
void SetDb(Db * pdb);
void SetExportThread(ExportThread * pexport_thread);
void ReadExportDirs();
@@ -83,7 +81,6 @@ private:
System * system;
Config * config;
EDb * edb;
Db * db;
ExportThread * export_thread;
bool use_rsa;

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2021, Tomasz Sowa
* Copyright (c) 2012-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,6 @@
#define headerfile_winix_plugins_export_funexport
#include "functions/functionbase.h"
#include "db/db.h"
#include "exportinfo.h"
namespace Winix

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2022, Tomasz Sowa
* Copyright (c) 2011-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,7 @@
#include "edb.h"
#include "funexport.h"
#include "functions/functions.h"
#include "models/migration.h"
namespace Winix
@@ -239,6 +240,20 @@ void ProcessRequest(PluginInfo & info)
}
void DatabaseMigration(PluginInfo & info)
{
bool ok = true;
Export export_model;
ExportFtp export_ftp;
ok = ok && Migration::do_migration(info.model_connector, export_model);
ok = ok && Migration::do_migration(info.model_connector, export_ftp);
info.res = ok;
}
void AddEzcFunctions(PluginInfo & info);
} // namespace
@@ -251,36 +266,33 @@ void Init(PluginInfo & info)
{
using namespace Export;
edb.set_dependency(info.functions);
edb.SetConn(info.db->GetConn());
edb.LogQueries(info.config->log_db_query);
edb.SetDirs(&info.system->dirs);
export_info.set_dependency((WinixModelDeprecated*)info.functions);
export_info.SetSystem(info.system);
export_info.SetConfig(info.config);
export_info.SetEDb(&edb);
export_info.SetDb(info.db);
export_info.SetExportThread(&export_thread);
fun_export.SetExportInfo(&export_info);
// info.plugin->Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
info.plugin->Assign(WINIX_ADD_MOUNTS, AddMountParams);
// info.plugin->Assign(WINIX_FSTAB_CHANGED, FstabChanged);
// info.plugin->Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
info.plugin->Assign(WINIX_MAKE_DATABASE_MIGRATION, DatabaseMigration);
info.plugin->Assign(WINIX_ADD_MOUNTS, AddMountParams);
// info.plugin->Assign(WINIX_FSTAB_CHANGED, FstabChanged);
info.plugin->Assign(WINIX_CREATE_FUNCTIONS, AddWinixFunctions);
info.plugin->Assign(WINIX_FILE_ADDED, SendFileAdded);
info.plugin->Assign(WINIX_FILE_ADDED, SendFileAdded);
info.plugin->Assign(WINIX_FILE_CHANGED, SendFileChanged);
info.plugin->Assign(WINIX_CREATED_THUMB, SendFileThumb);
info.plugin->Assign(WINIX_IMAGE_RESIZED, SendFileResized);
info.plugin->Assign(WINIX_CREATED_THUMB, SendFileThumb);
info.plugin->Assign(WINIX_IMAGE_RESIZED, SendFileResized);
info.plugin->Assign(WINIX_FILE_PREPARE_TO_MOVE, SendFilePrepareMove);
info.plugin->Assign(WINIX_FILE_MOVED, SendFileCopied);
info.plugin->Assign(WINIX_FILE_MOVED, SendFileCopied);
info.plugin->Assign(WINIX_FILE_COPIED, SendFileCopied);
info.plugin->Assign(WINIX_DIR_CONTENT_SORTED, SendDir);
info.plugin->Assign(WINIX_DIR_CONTENT_SORTED, SendDir);
info.plugin->Assign(WINIX_FILE_REMOVED, FileRemoved);
info.plugin->Assign(WINIX_PROCESS_REQUEST, ProcessRequest);

View File

@@ -1,53 +1,33 @@
# DO NOT DELETE
./gallery.o: gallery.h ../../../../winix/winixd/functions/functionbase.h
./gallery.o: ../../../../winix/winixd/db/db.h
./gallery.o: ../../../../winix/winixd/db/dbbase.h
./gallery.o: ../../../../winix/winixd/db/dbconn.h
./gallery.o: ../../../../winix/winixd/db/dbtextstream.h
./gallery.o: ../../../../winix/winixd/core/textstream.h
./gallery.o: ../../../../winix/winixd/core/misc.h
./gallery.o: ../../../../winix/winixd/core/request.h
./gallery.o: ../../../../winix/winixd/core/requesttypes.h
./gallery.o: ../../../../pikotools/src/textstream/textstream.h
./gallery.o: ../../../../pikotools/src/textstream/stream.h
./gallery.o: ../../../../pikotools/src/space/space.h
./gallery.o: ../../../../pikotools/src/convert/inttostr.h
./gallery.o: ../../../../pikotools/src/utf8/utf8.h
./gallery.o: ../../../../pikotools/src/convert/misc.h
./gallery.o: ../../../../pikotools/src/textstream/stream.h
./gallery.o: ../../../../pikotools/src/utf8/utf8.h
./gallery.o: ../../../../pikotools/src/date/date.h
./gallery.o: ../../../../pikotools/src/membuffer/membuffer.h
./gallery.o: ../../../../pikotools/src/textstream/types.h
./gallery.o: ../../../../pikotools/src/textstream/stream_private.h
./gallery.o: ../../../../winix/winixd/core/winix_const.h
./gallery.o: ../../../../pikotools/src/convert/convert.h
./gallery.o: ../../../../pikotools/src/convert/inttostr.h
./gallery.o: ../../../../pikotools/src/convert/patternreplacer.h
./gallery.o: ../../../../pikotools/src/convert/strtoint.h
./gallery.o: ../../../../pikotools/src/convert/text.h
./gallery.o: ../../../../pikotools/src/convert/misc.h
./gallery.o: ../../../../pikotools/src/textstream/types.h
./gallery.o: ../../../../pikotools/src/convert/double.h
./gallery.o: ../../../../winix/winixd/core/winixbase.h
./gallery.o: ../../../../winix/winixd/core/config.h
./gallery.o: ../../../../pikotools/src/space/spaceparser.h
./gallery.o: ../../../../pikotools/src/space/space.h
./gallery.o: ../../../../pikotools/src/convert/baseparser.h
./gallery.o: ../../../../winix/winixd/core/log.h
./gallery.o: ../../../../winix/winixd/core/logmanipulators.h
./gallery.o: ../../../../pikotools/src/log/log.h
./gallery.o: ../../../../pikotools/src/log/filelog.h
./gallery.o: ../../../../winix/winixd/core/filelog.h
./gallery.o: ../../../../winix/winixd/core/synchro.h
./gallery.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./gallery.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
./gallery.o: ../../../../winix/winixd/models/item.h
./gallery.o: ../../../../winix/winixd/models/winixmodel.h
./gallery.o: ../../../../morm/src/model.h
./gallery.o: ../../../../morm/src/modelconnector.h
./gallery.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./gallery.o: ../../../../morm/src/dbconnector.h
./gallery.o: ../../../../pikotools/src/log/log.h
./gallery.o: ../../../../pikotools/src/log/filelog.h
./gallery.o: ../../../../morm/src/queryresult.h
./gallery.o: ../../../../morm/src/flatconnector.h
./gallery.o: ../../../../morm/src/export.h
./gallery.o: ../../../../morm/src/dbexpression.h
./gallery.o: ../../../../morm/src/baseexpression.h
./gallery.o: ../../../../morm/src/morm_types.h
./gallery.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
./gallery.o: ../../../../morm/src/cursorhelper.h
./gallery.o: ../../../../morm/src/finderhelper.h
@@ -59,6 +39,11 @@
./gallery.o: ../../../../morm/src/select.h
./gallery.o: ../../../../morm/src/flatexpression.h
./gallery.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./gallery.o: ../../../../winix/winixd/core/log.h
./gallery.o: ../../../../winix/winixd/core/logmanipulators.h
./gallery.o: ../../../../winix/winixd/core/filelog.h
./gallery.o: ../../../../winix/winixd/core/synchro.h
./gallery.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./gallery.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
./gallery.o: ../../../../morm/src/jsonexpression.h
./gallery.o: ../../../../morm/src/postgresqlexpression.h
@@ -68,16 +53,25 @@
./gallery.o: ../../../../morm/src/postgresqlqueryresult.h
./gallery.o: ../../../../morm/src/xmlconnector.h
./gallery.o: ../../../../morm/src/transaction.h
./gallery.o: ../../../../winix/winixd/models/winixmodelconnector.h
./gallery.o: ../../../../winix/winixd/models/itemcontent.h
./gallery.o: ../../../../winix/winixd/templates/htmltextstream.h
./gallery.o: ../../../../winix/winixd/templates/misc.h
./gallery.o: ../../../../winix/winixd/templates/localefilter.h
./gallery.o: ../../../../winix/winixd/templates/locale.h
./gallery.o: ../../../../pikotools/src/space/spaceparser.h
./gallery.o: ../../../../pikotools/src/space/space.h
./gallery.o: ../../../../pikotools/src/convert/baseparser.h
./gallery.o: ../../../../winix/winixd/core/winixbase.h
./gallery.o: ../../../../winix/winixd/core/config.h
./gallery.o: ../../../../winix/winixd/core/log.h
./gallery.o: ../../../../winix/winixd/core/filelog.h
./gallery.o: ../../../../winix/winixd/core/lock.h
./gallery.o: ../../../../winix/winixd/core/synchro.h
./gallery.o: ../../../../winix/winixd/core/error.h
./gallery.o: ../../../../winix/winixd/models/user.h
./gallery.o: ../../../../winix/winixd/templates/misc.h
./gallery.o: ../../../../winix/winixd/templates/localefilter.h
./gallery.o: ../../../../winix/winixd/templates/locale.h
./gallery.o: ../../../../pikotools/src/convert/patternreplacer.h
./gallery.o: ../../../../pikotools/src/convert/strtoint.h
./gallery.o: ../../../../pikotools/src/convert/text.h
./gallery.o: ../../../../pikotools/src/convert/misc.h
./gallery.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./gallery.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./gallery.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
@@ -86,29 +80,18 @@
./gallery.o: ../../../../ezc/src/expressionparser.h
./gallery.o: ../../../../ezc/src/models.h ../../../../ezc/src/patternparser.h
./gallery.o: ../../../../winix/winixd/templates/htmltextstream.h
./gallery.o: ../../../../winix/winixd/models/winixmodel.h
./gallery.o: ../../../../winix/winixd/models/winixmodelconnector.h
./gallery.o: ../../../../winix/winixd/models/group.h
./gallery.o: ../../../../winix/winixd/core/dircontainer.h
./gallery.o: ../../../../winix/winixd/core/winixbase.h
./gallery.o: ../../../../winix/winixd/models/item.h
./gallery.o: ../../../../winix/winixd/models/itemcontent.h
./gallery.o: ../../../../winix/winixd/templates/htmltextstream.h
./gallery.o: ../../../../winix/winixd/core/ugcontainer.h
./gallery.o: ../../../../winix/winixd/core/request.h
./gallery.o: ../../../../winix/winixd/core/error.h
./gallery.o: ../../../../winix/winixd/core/config.h
./gallery.o: ../../../../winix/winixd/core/textstream.h
./gallery.o: ../../../../winix/winixd/models/winixmodel.h
./gallery.o: ../../../../winix/winixd/core/header.h
./gallery.o: ../../../../winix/winixd/core/compress.h
./gallery.o: ../../../../winix/winixd/core/winixbase.h
./gallery.o: ../../../../winix/winixd/core/plugin.h
./gallery.o: ../../../../winix/winixd/core/pluginmsg.h
./gallery.o: ../../../../winix/winixd/core/plugindata.h
./gallery.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./gallery.o: ../../../../winix/winixd/core/mount.h
./gallery.o: ../../../../winix/winixd/core/mounts.h
./gallery.o: ../../../../winix/winixd/core/request.h
./gallery.o: ../../../../winix/winixd/core/mountparser.h
./gallery.o: ../../../../winix/winixd/core/jobtask.h
./gallery.o: ../../../../winix/winixd/notify/notify.h
@@ -121,9 +104,11 @@
./gallery.o: ../../../../winix/winixd/core/basethread.h
./gallery.o: ../../../../winix/winixd/notify/templatesnotify.h
./gallery.o: ../../../../winix/winixd/core/users.h
./gallery.o: ../../../../winix/winixd/models/user.h
./gallery.o: ../../../../winix/winixd/core/ugcontainer.h
./gallery.o: ../../../../winix/winixd/core/lastcontainer.h
./gallery.o: ../../../../winix/winixd/core/cur.h
./gallery.o: ../../../../winix/winixd/core/request.h
./gallery.o: ../../../../winix/winixd/core/session.h
./gallery.o: ../../../../winix/winixd/core/rebus.h
./gallery.o: ../../../../winix/winixd/core/ipban.h
@@ -140,6 +125,7 @@
./gallery.o: ../../../../winix/winixd/core/run.h
./gallery.o: ../../../../winix/winixd/core/users.h
./gallery.o: ../../../../winix/winixd/core/groups.h
./gallery.o: ../../../../winix/winixd/models/group.h
./gallery.o: ../../../../winix/winixd/core/image.h
./gallery.o: ../../../../winix/winixd/core/threadmanager.h
./gallery.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -151,7 +137,7 @@
./gallery.o: ../../../../winix/winixd/core/ipbancontainer.h
./gallery.o: ../../../../winix/winixd/core/sessionidmanager.h
./gallery.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./gallery.o: ../../../../winix/winixd/core/slog.h galleryinfo.h
./gallery.o: galleryinfo.h
./galleryinfo.o: galleryinfo.h ../../../../winix/winixd/models/item.h
./galleryinfo.o: ../../../../winix/winixd/models/winixmodel.h
./galleryinfo.o: ../../../../morm/src/model.h
@@ -159,8 +145,9 @@
./galleryinfo.o: ../../../../pikotools/src/textstream/stream.h
./galleryinfo.o: ../../../../pikotools/src/space/space.h
./galleryinfo.o: ../../../../pikotools/src/convert/inttostr.h
./galleryinfo.o: ../../../../pikotools/src/utf8/utf8.h
./galleryinfo.o: ../../../../pikotools/src/convert/misc.h
./galleryinfo.o: ../../../../pikotools/src/textstream/stream.h
./galleryinfo.o: ../../../../pikotools/src/utf8/utf8.h
./galleryinfo.o: ../../../../pikotools/src/date/date.h
./galleryinfo.o: ../../../../pikotools/src/membuffer/membuffer.h
./galleryinfo.o: ../../../../pikotools/src/textstream/types.h
@@ -189,18 +176,6 @@
./galleryinfo.o: ../../../../morm/src/flatexpression.h
./galleryinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./galleryinfo.o: ../../../../winix/winixd/core/log.h
./galleryinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h
./galleryinfo.o: ../../../../winix/winixd/models/itemcontent.h
./galleryinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
./galleryinfo.o: ../../../../winix/winixd/templates/misc.h
./galleryinfo.o: ../../../../winix/winixd/templates/localefilter.h
./galleryinfo.o: ../../../../winix/winixd/templates/locale.h
./galleryinfo.o: ../../../../pikotools/src/space/spaceparser.h
./galleryinfo.o: ../../../../pikotools/src/space/space.h
./galleryinfo.o: ../../../../pikotools/src/convert/baseparser.h
./galleryinfo.o: ../../../../winix/winixd/core/winixbase.h
./galleryinfo.o: ../../../../winix/winixd/core/config.h
./galleryinfo.o: ../../../../winix/winixd/core/log.h
./galleryinfo.o: ../../../../winix/winixd/core/logmanipulators.h
./galleryinfo.o: ../../../../winix/winixd/core/filelog.h
./galleryinfo.o: ../../../../winix/winixd/core/synchro.h
@@ -214,10 +189,25 @@
./galleryinfo.o: ../../../../morm/src/postgresqlqueryresult.h
./galleryinfo.o: ../../../../morm/src/xmlconnector.h
./galleryinfo.o: ../../../../morm/src/transaction.h
./galleryinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h
./galleryinfo.o: ../../../../winix/winixd/models/itemcontent.h
./galleryinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
./galleryinfo.o: ../../../../winix/winixd/templates/misc.h
./galleryinfo.o: ../../../../winix/winixd/templates/localefilter.h
./galleryinfo.o: ../../../../winix/winixd/templates/locale.h
./galleryinfo.o: ../../../../pikotools/src/space/spaceparser.h
./galleryinfo.o: ../../../../pikotools/src/space/space.h
./galleryinfo.o: ../../../../pikotools/src/convert/baseparser.h
./galleryinfo.o: ../../../../winix/winixd/core/winixbase.h
./galleryinfo.o: ../../../../winix/winixd/core/config.h
./galleryinfo.o: ../../../../winix/winixd/core/log.h
./galleryinfo.o: ../../../../winix/winixd/core/filelog.h
./galleryinfo.o: ../../../../winix/winixd/core/lock.h
./galleryinfo.o: ../../../../winix/winixd/core/synchro.h
./galleryinfo.o: ../../../../pikotools/src/convert/patternreplacer.h
./galleryinfo.o: ../../../../pikotools/src/convert/strtoint.h
./galleryinfo.o: ../../../../pikotools/src/convert/text.h
./galleryinfo.o: ../../../../pikotools/src/convert/misc.h
./galleryinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./galleryinfo.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./galleryinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
@@ -228,52 +218,32 @@
./galleryinfo.o: ../../../../ezc/src/patternparser.h
./galleryinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: gallery.h ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/db/db.h
./init.o: ../../../../winix/winixd/db/dbbase.h
./init.o: ../../../../winix/winixd/db/dbconn.h
./init.o: ../../../../winix/winixd/db/dbtextstream.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/core/misc.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/requesttypes.h
./init.o: ../../../../pikotools/src/textstream/textstream.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/date/date.h
./init.o: ../../../../pikotools/src/membuffer/membuffer.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../pikotools/src/textstream/stream_private.h
./init.o: ../../../../winix/winixd/core/winix_const.h
./init.o: ../../../../pikotools/src/convert/convert.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../pikotools/src/convert/double.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/logmanipulators.h
./init.o: ../../../../pikotools/src/log/log.h
./init.o: ../../../../pikotools/src/log/filelog.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/synchro.h ../../../../morm/src/morm.h
./init.o: ../../../../morm/src/version.h ../../../../morm/src/morm_types.h
./init.o: ../../../../winix/winixd/models/item.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
./init.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./init.o: ../../../../morm/src/dbconnector.h
./init.o: ../../../../pikotools/src/log/log.h
./init.o: ../../../../pikotools/src/log/filelog.h
./init.o: ../../../../morm/src/queryresult.h
./init.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/export.h
./init.o: ../../../../morm/src/dbexpression.h
./init.o: ../../../../morm/src/baseexpression.h
./init.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
./init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
./init.o: ../../../../morm/src/modeldata.h
./init.o: ../../../../morm/src/cursorhelper.h
./init.o: ../../../../morm/src/finderhelper.h
./init.o: ../../../../morm/src/fieldvaluehelper.h
@@ -282,8 +252,12 @@
./init.o: ../../../../morm/src/modelcontainerwrapper.h
./init.o: ../../../../morm/src/select.h ../../../../morm/src/flatexpression.h
./init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./init.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
./init.o: ../../../../morm/src/jsonexpression.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/logmanipulators.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/synchro.h ../../../../morm/src/morm.h
./init.o: ../../../../morm/src/version.h ../../../../morm/src/finder.h
./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
./init.o: ../../../../morm/src/postgresqlexpression.h
./init.o: ../../../../morm/src/xmlexpression.h
./init.o: ../../../../morm/src/jsonconnector.h
@@ -291,47 +265,44 @@
./init.o: ../../../../morm/src/postgresqlqueryresult.h
./init.o: ../../../../morm/src/xmlconnector.h
./init.o: ../../../../morm/src/transaction.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
./init.o: ../../../../winix/winixd/models/itemcontent.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/templates/misc.h
./init.o: ../../../../winix/winixd/templates/localefilter.h
./init.o: ../../../../winix/winixd/templates/locale.h
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/lock.h
./init.o: ../../../../winix/winixd/core/synchro.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/templates/misc.h
./init.o: ../../../../winix/winixd/templates/localefilter.h
./init.o: ../../../../winix/winixd/templates/locale.h
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./init.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
./init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
./init.o: ../../../../ezc/src/outstreams.h
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
./init.o: ../../../../ezc/src/version.h ../../../../ezc/src/generator.h
./init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
./init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/objects.h
./init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
./init.o: ../../../../ezc/src/patternparser.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/dircontainer.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/models/item.h
./init.o: ../../../../winix/winixd/models/itemcontent.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/core/header.h
./init.o: ../../../../winix/winixd/core/compress.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/plugin.h
./init.o: ../../../../winix/winixd/core/pluginmsg.h
./init.o: ../../../../winix/winixd/core/plugindata.h
./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./init.o: ../../../../winix/winixd/core/mount.h
./init.o: ../../../../winix/winixd/core/mounts.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/mountparser.h
./init.o: ../../../../winix/winixd/core/jobtask.h
./init.o: ../../../../winix/winixd/notify/notify.h
@@ -344,9 +315,11 @@
./init.o: ../../../../winix/winixd/core/basethread.h
./init.o: ../../../../winix/winixd/notify/templatesnotify.h
./init.o: ../../../../winix/winixd/core/users.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/lastcontainer.h
./init.o: ../../../../winix/winixd/core/cur.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/session.h
./init.o: ../../../../winix/winixd/core/rebus.h
./init.o: ../../../../winix/winixd/core/ipban.h
@@ -363,6 +336,7 @@
./init.o: ../../../../winix/winixd/core/run.h
./init.o: ../../../../winix/winixd/core/users.h
./init.o: ../../../../winix/winixd/core/groups.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/image.h
./init.o: ../../../../winix/winixd/core/threadmanager.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -374,8 +348,7 @@
./init.o: ../../../../winix/winixd/core/ipbancontainer.h
./init.o: ../../../../winix/winixd/core/sessionidmanager.h
./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./init.o: ../../../../winix/winixd/core/slog.h galleryinfo.h
./init.o: ../../../../winix/winixd/core/plugin.h
./init.o: galleryinfo.h ../../../../winix/winixd/core/plugin.h
./init.o: ../../../../winix/winixd/functions/functions.h
./init.o: ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/functions/functionparser.h
@@ -430,53 +403,33 @@
./init.o: ../../../../winix/winixd/functions/vim.h
./init.o: ../../../../pikotools/src/html/htmlparser.h
./templates.o: gallery.h ../../../../winix/winixd/functions/functionbase.h
./templates.o: ../../../../winix/winixd/db/db.h
./templates.o: ../../../../winix/winixd/db/dbbase.h
./templates.o: ../../../../winix/winixd/db/dbconn.h
./templates.o: ../../../../winix/winixd/db/dbtextstream.h
./templates.o: ../../../../winix/winixd/core/textstream.h
./templates.o: ../../../../winix/winixd/core/misc.h
./templates.o: ../../../../winix/winixd/core/request.h
./templates.o: ../../../../winix/winixd/core/requesttypes.h
./templates.o: ../../../../pikotools/src/textstream/textstream.h
./templates.o: ../../../../pikotools/src/textstream/stream.h
./templates.o: ../../../../pikotools/src/space/space.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/utf8/utf8.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../pikotools/src/textstream/stream.h
./templates.o: ../../../../pikotools/src/utf8/utf8.h
./templates.o: ../../../../pikotools/src/date/date.h
./templates.o: ../../../../pikotools/src/membuffer/membuffer.h
./templates.o: ../../../../pikotools/src/textstream/types.h
./templates.o: ../../../../pikotools/src/textstream/stream_private.h
./templates.o: ../../../../winix/winixd/core/winix_const.h
./templates.o: ../../../../pikotools/src/convert/convert.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/strtoint.h
./templates.o: ../../../../pikotools/src/convert/text.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../pikotools/src/textstream/types.h
./templates.o: ../../../../pikotools/src/convert/double.h
./templates.o: ../../../../winix/winixd/core/winixbase.h
./templates.o: ../../../../winix/winixd/core/config.h
./templates.o: ../../../../pikotools/src/space/spaceparser.h
./templates.o: ../../../../pikotools/src/space/space.h
./templates.o: ../../../../pikotools/src/convert/baseparser.h
./templates.o: ../../../../winix/winixd/core/log.h
./templates.o: ../../../../winix/winixd/core/logmanipulators.h
./templates.o: ../../../../pikotools/src/log/log.h
./templates.o: ../../../../pikotools/src/log/filelog.h
./templates.o: ../../../../winix/winixd/core/filelog.h
./templates.o: ../../../../winix/winixd/core/synchro.h
./templates.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./templates.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
./templates.o: ../../../../winix/winixd/models/item.h
./templates.o: ../../../../winix/winixd/models/winixmodel.h
./templates.o: ../../../../morm/src/model.h
./templates.o: ../../../../morm/src/modelconnector.h
./templates.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./templates.o: ../../../../morm/src/dbconnector.h
./templates.o: ../../../../pikotools/src/log/log.h
./templates.o: ../../../../pikotools/src/log/filelog.h
./templates.o: ../../../../morm/src/queryresult.h
./templates.o: ../../../../morm/src/flatconnector.h
./templates.o: ../../../../morm/src/export.h
./templates.o: ../../../../morm/src/dbexpression.h
./templates.o: ../../../../morm/src/baseexpression.h
./templates.o: ../../../../morm/src/morm_types.h
./templates.o: ../../../../morm/src/modelenv.h
./templates.o: ../../../../morm/src/modeldata.h
./templates.o: ../../../../morm/src/cursorhelper.h
@@ -489,6 +442,11 @@
./templates.o: ../../../../morm/src/select.h
./templates.o: ../../../../morm/src/flatexpression.h
./templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./templates.o: ../../../../winix/winixd/core/log.h
./templates.o: ../../../../winix/winixd/core/logmanipulators.h
./templates.o: ../../../../winix/winixd/core/filelog.h
./templates.o: ../../../../winix/winixd/core/synchro.h
./templates.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
./templates.o: ../../../../morm/src/jsonexpression.h
./templates.o: ../../../../morm/src/postgresqlexpression.h
@@ -498,16 +456,25 @@
./templates.o: ../../../../morm/src/postgresqlqueryresult.h
./templates.o: ../../../../morm/src/xmlconnector.h
./templates.o: ../../../../morm/src/transaction.h
./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h
./templates.o: ../../../../winix/winixd/models/itemcontent.h
./templates.o: ../../../../winix/winixd/templates/htmltextstream.h
./templates.o: ../../../../winix/winixd/templates/misc.h
./templates.o: ../../../../winix/winixd/templates/localefilter.h
./templates.o: ../../../../winix/winixd/templates/locale.h
./templates.o: ../../../../pikotools/src/space/spaceparser.h
./templates.o: ../../../../pikotools/src/space/space.h
./templates.o: ../../../../pikotools/src/convert/baseparser.h
./templates.o: ../../../../winix/winixd/core/winixbase.h
./templates.o: ../../../../winix/winixd/core/config.h
./templates.o: ../../../../winix/winixd/core/log.h
./templates.o: ../../../../winix/winixd/core/filelog.h
./templates.o: ../../../../winix/winixd/core/lock.h
./templates.o: ../../../../winix/winixd/core/synchro.h
./templates.o: ../../../../winix/winixd/core/error.h
./templates.o: ../../../../winix/winixd/models/user.h
./templates.o: ../../../../winix/winixd/templates/misc.h
./templates.o: ../../../../winix/winixd/templates/localefilter.h
./templates.o: ../../../../winix/winixd/templates/locale.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/strtoint.h
./templates.o: ../../../../pikotools/src/convert/text.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./templates.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
@@ -517,29 +484,18 @@
./templates.o: ../../../../ezc/src/models.h
./templates.o: ../../../../ezc/src/patternparser.h
./templates.o: ../../../../winix/winixd/templates/htmltextstream.h
./templates.o: ../../../../winix/winixd/models/winixmodel.h
./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h
./templates.o: ../../../../winix/winixd/models/group.h
./templates.o: ../../../../winix/winixd/core/dircontainer.h
./templates.o: ../../../../winix/winixd/core/winixbase.h
./templates.o: ../../../../winix/winixd/models/item.h
./templates.o: ../../../../winix/winixd/models/itemcontent.h
./templates.o: ../../../../winix/winixd/templates/htmltextstream.h
./templates.o: ../../../../winix/winixd/core/ugcontainer.h
./templates.o: ../../../../winix/winixd/core/request.h
./templates.o: ../../../../winix/winixd/core/error.h
./templates.o: ../../../../winix/winixd/core/config.h
./templates.o: ../../../../winix/winixd/core/textstream.h
./templates.o: ../../../../winix/winixd/models/winixmodel.h
./templates.o: ../../../../winix/winixd/core/header.h
./templates.o: ../../../../winix/winixd/core/compress.h
./templates.o: ../../../../winix/winixd/core/winixbase.h
./templates.o: ../../../../winix/winixd/core/plugin.h
./templates.o: ../../../../winix/winixd/core/pluginmsg.h
./templates.o: ../../../../winix/winixd/core/plugindata.h
./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./templates.o: ../../../../winix/winixd/core/mount.h
./templates.o: ../../../../winix/winixd/core/mounts.h
./templates.o: ../../../../winix/winixd/core/request.h
./templates.o: ../../../../winix/winixd/core/mountparser.h
./templates.o: ../../../../winix/winixd/core/jobtask.h
./templates.o: ../../../../winix/winixd/notify/notify.h
@@ -552,9 +508,11 @@
./templates.o: ../../../../winix/winixd/core/basethread.h
./templates.o: ../../../../winix/winixd/notify/templatesnotify.h
./templates.o: ../../../../winix/winixd/core/users.h
./templates.o: ../../../../winix/winixd/models/user.h
./templates.o: ../../../../winix/winixd/core/ugcontainer.h
./templates.o: ../../../../winix/winixd/core/lastcontainer.h
./templates.o: ../../../../winix/winixd/core/cur.h
./templates.o: ../../../../winix/winixd/core/request.h
./templates.o: ../../../../winix/winixd/core/session.h
./templates.o: ../../../../winix/winixd/core/rebus.h
./templates.o: ../../../../winix/winixd/core/ipban.h
@@ -571,6 +529,7 @@
./templates.o: ../../../../winix/winixd/core/run.h
./templates.o: ../../../../winix/winixd/core/users.h
./templates.o: ../../../../winix/winixd/core/groups.h
./templates.o: ../../../../winix/winixd/models/group.h
./templates.o: ../../../../winix/winixd/core/image.h
./templates.o: ../../../../winix/winixd/core/threadmanager.h
./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -582,8 +541,12 @@
./templates.o: ../../../../winix/winixd/core/ipbancontainer.h
./templates.o: ../../../../winix/winixd/core/sessionidmanager.h
./templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./templates.o: ../../../../winix/winixd/core/slog.h galleryinfo.h
./templates.o: ../../../../winix/winixd/core/misc.h
./templates.o: galleryinfo.h ../../../../winix/winixd/core/misc.h
./templates.o: ../../../../winix/winixd/core/winix_const.h
./templates.o: ../../../../pikotools/src/convert/convert.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/double.h
./templates.o: ../../../../winix/winixd/core/plugin.h
./templates.o: ../../../../winix/winixd/templates/templates.h
./templates.o: ../../../../winix/winixd/templates/patterncacher.h

View File

@@ -19,12 +19,16 @@
./groupinfo.o: ../../../../pikotools/src/space/space.h
# ../../../../pikotools/src/space/space.h includes:
# convert/inttostr.h
# convert/misc.h
# utf8/utf8.h
./groupinfo.o: ../../../../pikotools/src/convert/inttostr.h
./groupinfo.o: ../../../../pikotools/src/convert/misc.h
# ../../../../pikotools/src/convert/misc.h includes:
# textstream/stream.h
./groupinfo.o: ../../../../pikotools/src/textstream/stream.h
./groupinfo.o: ../../../../pikotools/src/utf8/utf8.h
# ../../../../pikotools/src/utf8/utf8.h includes:
# textstream/stream.h
./groupinfo.o: ../../../../pikotools/src/textstream/stream.h
./groupinfo.o: ../../../../pikotools/src/convert/baseparser.h
# ../../../../pikotools/src/convert/baseparser.h includes:
# textstream/textstream.h
@@ -51,7 +55,6 @@
# core/winixsystem.h
# core/cur.h
# core/sessionmanager.h
# core/slog.h
# templates/locale.h
./groupinfo.o: ../../../../winix/winixd/core/winixsystem.h
# ../../../../winix/winixd/core/winixsystem.h includes:
@@ -62,7 +65,6 @@
# job.h
# dirs.h
# mounts.h
# db/db.h
# request.h
# config.h
# crypt.h
@@ -182,7 +184,6 @@
./groupinfo.o: ../../../../morm/src/dbexpression.h
# ../../../../morm/src/dbexpression.h includes:
# baseexpression.h
# morm_types.h
./groupinfo.o: ../../../../morm/src/baseexpression.h
# ../../../../morm/src/baseexpression.h includes:
# textstream/stream.h
@@ -289,7 +290,6 @@
# models/item.h
# error.h
# config.h
# textstream.h
# templates/htmltextstream.h
# date/date.h
# space/space.h
@@ -359,11 +359,6 @@
# misc.h
./groupinfo.o: ../../../../pikotools/src/convert/text.h
./groupinfo.o: ../../../../pikotools/src/convert/misc.h
# ../../../../pikotools/src/convert/misc.h includes:
# text.h
# textstream/stream.h
# textstream/types.h
./groupinfo.o: ../../../../pikotools/src/textstream/types.h
./groupinfo.o: ../../../../ezc/src/ezc.h
# ../../../../ezc/src/ezc.h includes:
# version.h
@@ -420,32 +415,6 @@
./groupinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
./groupinfo.o: ../../../../winix/winixd/core/error.h
./groupinfo.o: ../../../../winix/winixd/core/config.h
./groupinfo.o: ../../../../winix/winixd/core/textstream.h
# ../../../../winix/winixd/core/textstream.h includes:
# misc.h
# space/space.h
# date/date.h
# textstream/textstream.h
# utf8/utf8.h
./groupinfo.o: ../../../../winix/winixd/core/misc.h
# ../../../../winix/winixd/core/misc.h includes:
# requesttypes.h
# date/date.h
# textstream/textstream.h
# utf8/utf8.h
# winix_const.h
# convert/convert.h
./groupinfo.o: ../../../../winix/winixd/core/winix_const.h
./groupinfo.o: ../../../../pikotools/src/convert/convert.h
# ../../../../pikotools/src/convert/convert.h includes:
# inttostr.h
# patternreplacer.h
# strtoint.h
# text.h
# double.h
./groupinfo.o: ../../../../pikotools/src/convert/inttostr.h
./groupinfo.o: ../../../../pikotools/src/convert/patternreplacer.h
./groupinfo.o: ../../../../pikotools/src/convert/double.h
./groupinfo.o: ../../../../winix/winixd/models/winixmodel.h
./groupinfo.o: ../../../../winix/winixd/core/header.h
# ../../../../winix/winixd/core/header.h includes:
@@ -469,53 +438,8 @@
./groupinfo.o: ../../../../winix/winixd/core/mounts.h
# ../../../../winix/winixd/core/mounts.h includes:
# mount.h
# error.h
# db/db.h
# request.h
# mountparser.h
# winixmodeldeprecated.h
./groupinfo.o: ../../../../winix/winixd/db/db.h
# ../../../../winix/winixd/db/db.h includes:
# dbbase.h
# models/user.h
# models/group.h
# core/dircontainer.h
# core/ugcontainer.h
./groupinfo.o: ../../../../winix/winixd/db/dbbase.h
# ../../../../winix/winixd/db/dbbase.h includes:
# dbconn.h
# dbtextstream.h
# core/error.h
# space/spaceparser.h
# date/date.h
# core/winixbase.h
./groupinfo.o: ../../../../winix/winixd/db/dbconn.h
# ../../../../winix/winixd/db/dbconn.h includes:
# dbtextstream.h
# core/winixbase.h
./groupinfo.o: ../../../../winix/winixd/db/dbtextstream.h
# ../../../../winix/winixd/db/dbtextstream.h includes:
# core/textstream.h
# textstream/textstream.h
./groupinfo.o: ../../../../winix/winixd/core/textstream.h
./groupinfo.o: ../../../../winix/winixd/core/error.h
./groupinfo.o: ../../../../winix/winixd/models/user.h
# ../../../../winix/winixd/models/user.h includes:
# model.h
# space/space.h
# date/date.h
# templates/misc.h
# winixmodel.h
./groupinfo.o: ../../../../winix/winixd/models/group.h
# ../../../../winix/winixd/models/group.h includes:
# model.h
./groupinfo.o: ../../../../winix/winixd/core/dircontainer.h
# ../../../../winix/winixd/core/dircontainer.h includes:
# winixbase.h
# models/item.h
./groupinfo.o: ../../../../winix/winixd/core/ugcontainer.h
# ../../../../winix/winixd/core/ugcontainer.h includes:
# winixbase.h
./groupinfo.o: ../../../../winix/winixd/core/mountparser.h
# ../../../../winix/winixd/core/mountparser.h includes:
# mount.h
@@ -527,9 +451,15 @@
# models/user.h
# plugindata.h
# rebus.h
# textstream.h
# date/date.h
# ipban.h
./groupinfo.o: ../../../../winix/winixd/models/user.h
# ../../../../winix/winixd/models/user.h includes:
# model.h
# space/space.h
# date/date.h
# templates/misc.h
# winixmodel.h
./groupinfo.o: ../../../../winix/winixd/core/rebus.h
# ../../../../winix/winixd/core/rebus.h includes:
# winixbase.h
@@ -547,11 +477,13 @@
./groupinfo.o: ../../../../winix/winixd/core/dirs.h
# ../../../../winix/winixd/core/dirs.h includes:
# dircontainer.h
# db/db.h
# request.h
# models/item.h
# winixmodeldeprecated.h
./groupinfo.o: ../../../../winix/winixd/core/dircontainer.h
# ../../../../winix/winixd/core/dircontainer.h includes:
# winixbase.h
# models/item.h
./groupinfo.o: ../../../../winix/winixd/core/crypt.h
# ../../../../winix/winixd/core/crypt.h includes:
# run.h
@@ -567,9 +499,10 @@
# ugcontainer.h
# lastcontainer.h
# cur.h
# db/db.h
# models/winixmodel.h
./groupinfo.o: ../../../../winix/winixd/core/ugcontainer.h
# ../../../../winix/winixd/core/ugcontainer.h includes:
# winixbase.h
./groupinfo.o: ../../../../winix/winixd/core/lastcontainer.h
# ../../../../winix/winixd/core/lastcontainer.h includes:
# date/date.h
@@ -577,8 +510,6 @@
./groupinfo.o: ../../../../winix/winixd/core/image.h
# ../../../../winix/winixd/core/image.h includes:
# basethread.h
# textstream.h
# db/db.h
# core/config.h
# models/item.h
./groupinfo.o: ../../../../winix/winixd/core/threadmanager.h
@@ -618,7 +549,6 @@
./groupinfo.o: ../../../../winix/winixd/notify/templatesnotify.h
# ../../../../winix/winixd/notify/templatesnotify.h includes:
# ezc.h
# core/textstream.h
# notifypool.h
./groupinfo.o: ../../../../winix/winixd/core/users.h
./groupinfo.o: ../../../../winix/winixd/core/timezones.h
@@ -660,17 +590,12 @@
./groupinfo.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
# ../../../../tito/src/aes.h includes:
# log/log.h
./groupinfo.o: ../../../../winix/winixd/core/slog.h
# ../../../../winix/winixd/core/slog.h includes:
# cur.h
# logmanipulators.h
# templates/locale.h
# textstream/textstream.h
./groups.o: groups.h ../../../../pikotools/src/space/spaceparser.h
./groups.o: ../../../../pikotools/src/space/space.h
./groups.o: ../../../../pikotools/src/convert/inttostr.h
./groups.o: ../../../../pikotools/src/utf8/utf8.h
./groups.o: ../../../../pikotools/src/convert/misc.h
./groups.o: ../../../../pikotools/src/textstream/stream.h
./groups.o: ../../../../pikotools/src/utf8/utf8.h
./groups.o: ../../../../pikotools/src/convert/baseparser.h
./groups.o: ../../../../pikotools/src/textstream/textstream.h
./groups.o: ../../../../pikotools/src/textstream/stream.h
@@ -742,7 +667,6 @@
./groups.o: ../../../../pikotools/src/convert/strtoint.h
./groups.o: ../../../../pikotools/src/convert/text.h
./groups.o: ../../../../pikotools/src/convert/misc.h
./groups.o: ../../../../pikotools/src/textstream/types.h
./groups.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./groups.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./groups.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
@@ -753,13 +677,6 @@
./groups.o: ../../../../winix/winixd/templates/htmltextstream.h
./groups.o: ../../../../winix/winixd/core/error.h
./groups.o: ../../../../winix/winixd/core/config.h
./groups.o: ../../../../winix/winixd/core/textstream.h
./groups.o: ../../../../winix/winixd/core/misc.h
./groups.o: ../../../../winix/winixd/core/winix_const.h
./groups.o: ../../../../pikotools/src/convert/convert.h
./groups.o: ../../../../pikotools/src/convert/inttostr.h
./groups.o: ../../../../pikotools/src/convert/patternreplacer.h
./groups.o: ../../../../pikotools/src/convert/double.h
./groups.o: ../../../../winix/winixd/models/winixmodel.h
./groups.o: ../../../../winix/winixd/core/header.h
./groups.o: ../../../../winix/winixd/core/compress.h
@@ -769,18 +686,9 @@
./groups.o: ../../../../winix/winixd/core/plugindata.h
./groups.o: ../../../../winix/winixd/core/mount.h
./groups.o: ../../../../winix/winixd/core/mounts.h
./groups.o: ../../../../winix/winixd/db/db.h
./groups.o: ../../../../winix/winixd/db/dbbase.h
./groups.o: ../../../../winix/winixd/db/dbconn.h
./groups.o: ../../../../winix/winixd/db/dbtextstream.h
./groups.o: ../../../../winix/winixd/core/textstream.h
./groups.o: ../../../../winix/winixd/core/error.h
./groups.o: ../../../../winix/winixd/models/user.h
./groups.o: ../../../../winix/winixd/models/group.h
./groups.o: ../../../../winix/winixd/core/dircontainer.h
./groups.o: ../../../../winix/winixd/core/ugcontainer.h
./groups.o: ../../../../winix/winixd/core/mountparser.h
./groups.o: ../../../../winix/winixd/core/session.h
./groups.o: ../../../../winix/winixd/models/user.h
./groups.o: ../../../../winix/winixd/core/rebus.h
./groups.o: ../../../../winix/winixd/core/ipban.h
./groups.o: ../../../../winix/winixd/core/loadavg.h
@@ -814,7 +722,6 @@
./groups.o: ../../../../winix/winixd/core/ipbancontainer.h
./groups.o: ../../../../winix/winixd/core/sessionidmanager.h
./groups.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./groups.o: ../../../../winix/winixd/core/slog.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/plugin.h
# ../../../../winix/winixd/core/plugin.h includes:
@@ -831,8 +738,9 @@
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../pikotools/src/textstream/textstream.h
./init.o: ../../../../pikotools/src/textstream/stream.h
@@ -897,43 +805,25 @@
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./init.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
./init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
./init.o: ../../../../ezc/src/outstreams.h
./init.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
./init.o: ../../../../ezc/src/version.h ../../../../ezc/src/generator.h
./init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
./init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/objects.h
./init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
./init.o: ../../../../ezc/src/patternparser.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/core/misc.h
./init.o: ../../../../winix/winixd/core/winix_const.h
./init.o: ../../../../pikotools/src/convert/convert.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../pikotools/src/convert/double.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/core/header.h
./init.o: ../../../../winix/winixd/core/compress.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/plugin.h
./init.o: ../../../../winix/winixd/core/mounts.h
./init.o: ../../../../winix/winixd/db/db.h
./init.o: ../../../../winix/winixd/db/dbbase.h
./init.o: ../../../../winix/winixd/db/dbconn.h
./init.o: ../../../../winix/winixd/db/dbtextstream.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/dircontainer.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/mountparser.h
./init.o: ../../../../winix/winixd/core/session.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/core/rebus.h
./init.o: ../../../../winix/winixd/core/ipban.h
./init.o: ../../../../winix/winixd/core/loadavg.h
@@ -967,7 +857,6 @@
./init.o: ../../../../winix/winixd/core/ipbancontainer.h
./init.o: ../../../../winix/winixd/core/sessionidmanager.h
./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./init.o: ../../../../winix/winixd/core/slog.h
./init.o: ../../../../winix/winixd/functions/functions.h
# ../../../../winix/winixd/functions/functions.h includes:
# functionbase.h
@@ -1021,7 +910,6 @@
# core/winixrequest.h
./init.o: ../../../../winix/winixd/functions/functionbase.h
# ../../../../winix/winixd/functions/functionbase.h includes:
# db/db.h
# core/request.h
# core/config.h
# core/synchro.h
@@ -1031,7 +919,6 @@
./init.o: ../../../../winix/winixd/functions/functionparser.h
# ../../../../winix/winixd/functions/functionparser.h includes:
# core/winixmodeldeprecated.h
# db/db.h
# core/cur.h
# core/dirs.h
./init.o: ../../../../winix/winixd/core/dirs.h
@@ -1052,9 +939,7 @@
./init.o: ../../../../winix/winixd/functions/privchanger.h
# ../../../../winix/winixd/functions/privchanger.h includes:
# core/winixmodeldeprecated.h
# core/request.h
# core/system.h
# db/db.h
./init.o: ../../../../winix/winixd/functions/chown.h
# ../../../../winix/winixd/functions/chown.h includes:
# functionbase.h
@@ -1210,7 +1095,6 @@
# core/system.h
# core/sessionmanager.h
# html/htmlparser.h
# db/db.h
# core/winixrequest.h
./templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./templates.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
@@ -1264,6 +1148,7 @@
./templates.o: ../../../../winix/winixd/core/config.h
./templates.o: ../../../../pikotools/src/space/spaceparser.h
./templates.o: ../../../../pikotools/src/space/space.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../pikotools/src/convert/baseparser.h
./templates.o: ../../../../winix/winixd/core/log.h
./templates.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -1295,7 +1180,6 @@
./templates.o: ../../../../pikotools/src/convert/strtoint.h
./templates.o: ../../../../pikotools/src/convert/text.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../pikotools/src/textstream/types.h
./templates.o: ../../../../winix/winixd/templates/htmltextstream.h
./templates.o: ../../../../winix/winixd/templates/indexpatterns.h
# ../../../../winix/winixd/templates/indexpatterns.h includes:
@@ -1323,13 +1207,6 @@
./templates.o: ../../../../winix/winixd/core/requesttypes.h
./templates.o: ../../../../winix/winixd/core/error.h
./templates.o: ../../../../winix/winixd/core/config.h
./templates.o: ../../../../winix/winixd/core/textstream.h
./templates.o: ../../../../winix/winixd/core/misc.h
./templates.o: ../../../../winix/winixd/core/winix_const.h
./templates.o: ../../../../pikotools/src/convert/convert.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/double.h
./templates.o: ../../../../winix/winixd/models/winixmodel.h
./templates.o: ../../../../winix/winixd/core/header.h
./templates.o: ../../../../winix/winixd/core/compress.h
@@ -1339,18 +1216,9 @@
./templates.o: ../../../../winix/winixd/core/plugindata.h
./templates.o: ../../../../winix/winixd/core/mount.h
./templates.o: ../../../../winix/winixd/core/mounts.h
./templates.o: ../../../../winix/winixd/db/db.h
./templates.o: ../../../../winix/winixd/db/dbbase.h
./templates.o: ../../../../winix/winixd/db/dbconn.h
./templates.o: ../../../../winix/winixd/db/dbtextstream.h
./templates.o: ../../../../winix/winixd/core/textstream.h
./templates.o: ../../../../winix/winixd/core/error.h
./templates.o: ../../../../winix/winixd/models/user.h
./templates.o: ../../../../winix/winixd/models/group.h
./templates.o: ../../../../winix/winixd/core/dircontainer.h
./templates.o: ../../../../winix/winixd/core/ugcontainer.h
./templates.o: ../../../../winix/winixd/core/mountparser.h
./templates.o: ../../../../winix/winixd/core/session.h
./templates.o: ../../../../winix/winixd/models/user.h
./templates.o: ../../../../winix/winixd/core/rebus.h
./templates.o: ../../../../winix/winixd/core/ipban.h
./templates.o: ../../../../winix/winixd/core/loadavg.h
@@ -1371,7 +1239,6 @@
./templates.o: ../../../../winix/winixd/core/ipbancontainer.h
./templates.o: ../../../../winix/winixd/core/sessionidmanager.h
./templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./templates.o: ../../../../winix/winixd/core/slog.h
./templates.o: ../../../../winix/winixd/templates/locale.h
./templates.o: ../../../../winix/winixd/core/image.h
./templates.o: ../../../../winix/winixd/core/threadmanager.h
@@ -1388,3 +1255,21 @@
./templates.o: ../../../../pikotools/src/html/htmlparser.h
./templates.o: ../../../../winix/winixd/core/plugin.h groupinfo.h
./templates.o: ../../../../winix/winixd/core/misc.h
# ../../../../winix/winixd/core/misc.h includes:
# requesttypes.h
# date/date.h
# textstream/textstream.h
# utf8/utf8.h
# winix_const.h
# convert/convert.h
./templates.o: ../../../../winix/winixd/core/winix_const.h
./templates.o: ../../../../pikotools/src/convert/convert.h
# ../../../../pikotools/src/convert/convert.h includes:
# inttostr.h
# patternreplacer.h
# strtoint.h
# text.h
# double.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/double.h

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2021, Tomasz Sowa
* Copyright (c) 2011-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,7 +85,7 @@ bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
}
else
{
slog << logerror << "Syntax error in line: " << conf_parser.get_last_parsed_line() << logend;
//slog << logerror << "Syntax error in line: " << conf_parser.get_last_parsed_line() << logend;
log << log1 << "Syntax error in line: " << conf_parser.get_last_parsed_line() << logend;
groups.Clear();
}

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2021, Tomasz Sowa
* Copyright (c) 2011-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,10 +33,10 @@
*/
#include <algorithm>
#include <limits>
#include "groups.h"
#include "core/log.h"
namespace Winix
{
@@ -84,7 +84,7 @@ void Groups::Reindex()
}
else
{
slog << logerror << "set: " << set_name << " already defined (skipping)" << logend;
//slog << logerror << "set: " << set_name << " already defined (skipping)" << logend;
//space.remove_child_space(seti);
}
}
@@ -117,17 +117,17 @@ void Groups::ReindexGroups(GroupIndex & group_index, const std::wstring & set_na
}
else
{
slog << logwarning << "set: " << set_name
<< " has a group with a duplicated value: "
<< *vali << " (skipping)" << logend;
// slog << logwarning << "set: " << set_name
// << " has a group with a duplicated value: "
// << *vali << " (skipping)" << logend;
}
}
else
{
log << log1 << "key: " << key << " was not found" << logend;
slog << logwarning << "set: " << set_name
<< " has a group without a value (skipping)" << logend;
// slog << logwarning << "set: " << set_name
// << " has a group without a value (skipping)" << logend;
}
}

View File

@@ -2,55 +2,33 @@
./funregistermail.o: funregistermail.h
./funregistermail.o: ../../../../winix/winixd/functions/functionbase.h
./funregistermail.o: ../../../../winix/winixd/db/db.h
./funregistermail.o: ../../../../winix/winixd/db/dbbase.h
./funregistermail.o: ../../../../winix/winixd/db/dbconn.h
./funregistermail.o: ../../../../winix/winixd/db/dbtextstream.h
./funregistermail.o: ../../../../winix/winixd/core/textstream.h
./funregistermail.o: ../../../../winix/winixd/core/misc.h
./funregistermail.o: ../../../../winix/winixd/core/request.h
./funregistermail.o: ../../../../winix/winixd/core/requesttypes.h
./funregistermail.o: ../../../../pikotools/src/textstream/textstream.h
./funregistermail.o: ../../../../pikotools/src/textstream/stream.h
./funregistermail.o: ../../../../pikotools/src/space/space.h
./funregistermail.o: ../../../../pikotools/src/convert/inttostr.h
./funregistermail.o: ../../../../pikotools/src/utf8/utf8.h
./funregistermail.o: ../../../../pikotools/src/convert/misc.h
./funregistermail.o: ../../../../pikotools/src/textstream/stream.h
./funregistermail.o: ../../../../pikotools/src/utf8/utf8.h
./funregistermail.o: ../../../../pikotools/src/date/date.h
./funregistermail.o: ../../../../pikotools/src/membuffer/membuffer.h
./funregistermail.o: ../../../../pikotools/src/textstream/types.h
./funregistermail.o: ../../../../pikotools/src/textstream/stream_private.h
./funregistermail.o: ../../../../winix/winixd/core/winix_const.h
./funregistermail.o: ../../../../pikotools/src/convert/convert.h
./funregistermail.o: ../../../../pikotools/src/convert/inttostr.h
./funregistermail.o: ../../../../pikotools/src/convert/patternreplacer.h
./funregistermail.o: ../../../../pikotools/src/convert/strtoint.h
./funregistermail.o: ../../../../pikotools/src/convert/text.h
./funregistermail.o: ../../../../pikotools/src/convert/misc.h
./funregistermail.o: ../../../../pikotools/src/textstream/types.h
./funregistermail.o: ../../../../pikotools/src/convert/double.h
./funregistermail.o: ../../../../winix/winixd/core/winixbase.h
./funregistermail.o: ../../../../winix/winixd/core/config.h
./funregistermail.o: ../../../../pikotools/src/space/spaceparser.h
./funregistermail.o: ../../../../pikotools/src/space/space.h
./funregistermail.o: ../../../../pikotools/src/convert/baseparser.h
./funregistermail.o: ../../../../winix/winixd/core/log.h
./funregistermail.o: ../../../../winix/winixd/core/logmanipulators.h
./funregistermail.o: ../../../../pikotools/src/log/log.h
./funregistermail.o: ../../../../pikotools/src/log/filelog.h
./funregistermail.o: ../../../../winix/winixd/core/filelog.h
./funregistermail.o: ../../../../winix/winixd/core/synchro.h
./funregistermail.o: ../../../../morm/src/morm.h
./funregistermail.o: ../../../../morm/src/version.h
./funregistermail.o: ../../../../morm/src/morm_types.h
./funregistermail.o: ../../../../winix/winixd/models/item.h
./funregistermail.o: ../../../../winix/winixd/models/winixmodel.h
./funregistermail.o: ../../../../morm/src/model.h
./funregistermail.o: ../../../../morm/src/modelconnector.h
./funregistermail.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./funregistermail.o: ../../../../morm/src/dbconnector.h
./funregistermail.o: ../../../../pikotools/src/log/log.h
./funregistermail.o: ../../../../pikotools/src/log/filelog.h
./funregistermail.o: ../../../../morm/src/queryresult.h
./funregistermail.o: ../../../../morm/src/flatconnector.h
./funregistermail.o: ../../../../morm/src/export.h
./funregistermail.o: ../../../../morm/src/dbexpression.h
./funregistermail.o: ../../../../morm/src/baseexpression.h
./funregistermail.o: ../../../../morm/src/morm_types.h
./funregistermail.o: ../../../../morm/src/modelenv.h
./funregistermail.o: ../../../../morm/src/modeldata.h
./funregistermail.o: ../../../../morm/src/cursorhelper.h
@@ -63,6 +41,12 @@
./funregistermail.o: ../../../../morm/src/select.h
./funregistermail.o: ../../../../morm/src/flatexpression.h
./funregistermail.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./funregistermail.o: ../../../../winix/winixd/core/log.h
./funregistermail.o: ../../../../winix/winixd/core/logmanipulators.h
./funregistermail.o: ../../../../winix/winixd/core/filelog.h
./funregistermail.o: ../../../../winix/winixd/core/synchro.h
./funregistermail.o: ../../../../morm/src/morm.h
./funregistermail.o: ../../../../morm/src/version.h
./funregistermail.o: ../../../../morm/src/finder.h
./funregistermail.o: ../../../../morm/src/cursor.h
./funregistermail.o: ../../../../morm/src/jsonexpression.h
@@ -73,16 +57,25 @@
./funregistermail.o: ../../../../morm/src/postgresqlqueryresult.h
./funregistermail.o: ../../../../morm/src/xmlconnector.h
./funregistermail.o: ../../../../morm/src/transaction.h
./funregistermail.o: ../../../../winix/winixd/models/winixmodelconnector.h
./funregistermail.o: ../../../../winix/winixd/models/itemcontent.h
./funregistermail.o: ../../../../winix/winixd/templates/htmltextstream.h
./funregistermail.o: ../../../../winix/winixd/templates/misc.h
./funregistermail.o: ../../../../winix/winixd/templates/localefilter.h
./funregistermail.o: ../../../../winix/winixd/templates/locale.h
./funregistermail.o: ../../../../pikotools/src/space/spaceparser.h
./funregistermail.o: ../../../../pikotools/src/space/space.h
./funregistermail.o: ../../../../pikotools/src/convert/baseparser.h
./funregistermail.o: ../../../../winix/winixd/core/winixbase.h
./funregistermail.o: ../../../../winix/winixd/core/config.h
./funregistermail.o: ../../../../winix/winixd/core/log.h
./funregistermail.o: ../../../../winix/winixd/core/filelog.h
./funregistermail.o: ../../../../winix/winixd/core/lock.h
./funregistermail.o: ../../../../winix/winixd/core/synchro.h
./funregistermail.o: ../../../../winix/winixd/core/error.h
./funregistermail.o: ../../../../winix/winixd/models/user.h
./funregistermail.o: ../../../../winix/winixd/templates/misc.h
./funregistermail.o: ../../../../winix/winixd/templates/localefilter.h
./funregistermail.o: ../../../../winix/winixd/templates/locale.h
./funregistermail.o: ../../../../pikotools/src/convert/patternreplacer.h
./funregistermail.o: ../../../../pikotools/src/convert/strtoint.h
./funregistermail.o: ../../../../pikotools/src/convert/text.h
./funregistermail.o: ../../../../pikotools/src/convert/misc.h
./funregistermail.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./funregistermail.o: ../../../../ezc/src/generator.h
./funregistermail.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
@@ -94,29 +87,18 @@
./funregistermail.o: ../../../../ezc/src/models.h
./funregistermail.o: ../../../../ezc/src/patternparser.h
./funregistermail.o: ../../../../winix/winixd/templates/htmltextstream.h
./funregistermail.o: ../../../../winix/winixd/models/winixmodel.h
./funregistermail.o: ../../../../winix/winixd/models/winixmodelconnector.h
./funregistermail.o: ../../../../winix/winixd/models/group.h
./funregistermail.o: ../../../../winix/winixd/core/dircontainer.h
./funregistermail.o: ../../../../winix/winixd/core/winixbase.h
./funregistermail.o: ../../../../winix/winixd/models/item.h
./funregistermail.o: ../../../../winix/winixd/models/itemcontent.h
./funregistermail.o: ../../../../winix/winixd/templates/htmltextstream.h
./funregistermail.o: ../../../../winix/winixd/core/ugcontainer.h
./funregistermail.o: ../../../../winix/winixd/core/request.h
./funregistermail.o: ../../../../winix/winixd/core/error.h
./funregistermail.o: ../../../../winix/winixd/core/config.h
./funregistermail.o: ../../../../winix/winixd/core/textstream.h
./funregistermail.o: ../../../../winix/winixd/models/winixmodel.h
./funregistermail.o: ../../../../winix/winixd/core/header.h
./funregistermail.o: ../../../../winix/winixd/core/compress.h
./funregistermail.o: ../../../../winix/winixd/core/winixbase.h
./funregistermail.o: ../../../../winix/winixd/core/plugin.h
./funregistermail.o: ../../../../winix/winixd/core/pluginmsg.h
./funregistermail.o: ../../../../winix/winixd/core/plugindata.h
./funregistermail.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./funregistermail.o: ../../../../winix/winixd/core/mount.h
./funregistermail.o: ../../../../winix/winixd/core/mounts.h
./funregistermail.o: ../../../../winix/winixd/core/request.h
./funregistermail.o: ../../../../winix/winixd/core/mountparser.h
./funregistermail.o: ../../../../winix/winixd/core/jobtask.h
./funregistermail.o: ../../../../winix/winixd/notify/notify.h
@@ -129,9 +111,11 @@
./funregistermail.o: ../../../../winix/winixd/core/basethread.h
./funregistermail.o: ../../../../winix/winixd/notify/templatesnotify.h
./funregistermail.o: ../../../../winix/winixd/core/users.h
./funregistermail.o: ../../../../winix/winixd/models/user.h
./funregistermail.o: ../../../../winix/winixd/core/ugcontainer.h
./funregistermail.o: ../../../../winix/winixd/core/lastcontainer.h
./funregistermail.o: ../../../../winix/winixd/core/cur.h
./funregistermail.o: ../../../../winix/winixd/core/request.h
./funregistermail.o: ../../../../winix/winixd/core/session.h
./funregistermail.o: ../../../../winix/winixd/core/rebus.h
./funregistermail.o: ../../../../winix/winixd/core/ipban.h
@@ -148,6 +132,7 @@
./funregistermail.o: ../../../../winix/winixd/core/run.h
./funregistermail.o: ../../../../winix/winixd/core/users.h
./funregistermail.o: ../../../../winix/winixd/core/groups.h
./funregistermail.o: ../../../../winix/winixd/models/group.h
./funregistermail.o: ../../../../winix/winixd/core/image.h
./funregistermail.o: ../../../../winix/winixd/core/threadmanager.h
./funregistermail.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -159,61 +144,43 @@
./funregistermail.o: ../../../../winix/winixd/core/ipbancontainer.h
./funregistermail.o: ../../../../winix/winixd/core/sessionidmanager.h
./funregistermail.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./funregistermail.o: ../../../../winix/winixd/core/slog.h registermail_info.h
./funregistermail.o: mdb.h ../../../../winix/winixd/db/dbbase.h
./funregistermail.o: ../../../../winix/winixd/core/dirs.h
./funregistermail.o: registermail_info.h registermail.h mdb.h
./funregistermail.o: ../../../../winix/winixd/core/misc.h
./funregistermail.o: ../../../../winix/winixd/core/winix_const.h
./funregistermail.o: ../../../../pikotools/src/convert/convert.h
./funregistermail.o: ../../../../pikotools/src/convert/inttostr.h
./funregistermail.o: ../../../../pikotools/src/convert/patternreplacer.h
./funregistermail.o: ../../../../pikotools/src/convert/double.h
./funregistermail_showusers.o: funregistermail_showusers.h
./funregistermail_showusers.o: ../../../../winix/winixd/functions/functionbase.h
./funregistermail_showusers.o: ../../../../winix/winixd/db/db.h
./funregistermail_showusers.o: ../../../../winix/winixd/db/dbbase.h
./funregistermail_showusers.o: ../../../../winix/winixd/db/dbconn.h
./funregistermail_showusers.o: ../../../../winix/winixd/db/dbtextstream.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/textstream.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/misc.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/request.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/requesttypes.h
./funregistermail_showusers.o: ../../../../pikotools/src/textstream/textstream.h
./funregistermail_showusers.o: ../../../../pikotools/src/textstream/stream.h
./funregistermail_showusers.o: ../../../../pikotools/src/space/space.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/inttostr.h
./funregistermail_showusers.o: ../../../../pikotools/src/utf8/utf8.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/misc.h
./funregistermail_showusers.o: ../../../../pikotools/src/textstream/stream.h
./funregistermail_showusers.o: ../../../../pikotools/src/utf8/utf8.h
./funregistermail_showusers.o: ../../../../pikotools/src/date/date.h
./funregistermail_showusers.o: ../../../../pikotools/src/membuffer/membuffer.h
./funregistermail_showusers.o: ../../../../pikotools/src/textstream/types.h
./funregistermail_showusers.o: ../../../../pikotools/src/textstream/stream_private.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/winix_const.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/convert.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/inttostr.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/patternreplacer.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/strtoint.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/text.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/misc.h
./funregistermail_showusers.o: ../../../../pikotools/src/textstream/types.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/double.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/winixbase.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/config.h
./funregistermail_showusers.o: ../../../../pikotools/src/space/spaceparser.h
./funregistermail_showusers.o: ../../../../pikotools/src/space/space.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/baseparser.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/log.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/logmanipulators.h
./funregistermail_showusers.o: ../../../../pikotools/src/log/log.h
./funregistermail_showusers.o: ../../../../pikotools/src/log/filelog.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/filelog.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/synchro.h
./funregistermail_showusers.o: ../../../../morm/src/morm.h
./funregistermail_showusers.o: ../../../../morm/src/version.h
./funregistermail_showusers.o: ../../../../morm/src/morm_types.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/item.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/winixmodel.h
./funregistermail_showusers.o: ../../../../morm/src/model.h
./funregistermail_showusers.o: ../../../../morm/src/modelconnector.h
./funregistermail_showusers.o: ../../../../morm/src/clearer.h
./funregistermail_showusers.o: ../../../../morm/src/ft.h
./funregistermail_showusers.o: ../../../../morm/src/dbconnector.h
./funregistermail_showusers.o: ../../../../pikotools/src/log/log.h
./funregistermail_showusers.o: ../../../../pikotools/src/log/filelog.h
./funregistermail_showusers.o: ../../../../morm/src/queryresult.h
./funregistermail_showusers.o: ../../../../morm/src/flatconnector.h
./funregistermail_showusers.o: ../../../../morm/src/export.h
./funregistermail_showusers.o: ../../../../morm/src/dbexpression.h
./funregistermail_showusers.o: ../../../../morm/src/baseexpression.h
./funregistermail_showusers.o: ../../../../morm/src/morm_types.h
./funregistermail_showusers.o: ../../../../morm/src/modelenv.h
./funregistermail_showusers.o: ../../../../morm/src/modeldata.h
./funregistermail_showusers.o: ../../../../morm/src/cursorhelper.h
@@ -227,6 +194,12 @@
./funregistermail_showusers.o: ../../../../morm/src/flatexpression.h
./funregistermail_showusers.o: ../../../../ezc/src/funinfo.h
./funregistermail_showusers.o: ../../../../ezc/src/item.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/log.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/logmanipulators.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/filelog.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/synchro.h
./funregistermail_showusers.o: ../../../../morm/src/morm.h
./funregistermail_showusers.o: ../../../../morm/src/version.h
./funregistermail_showusers.o: ../../../../morm/src/finder.h
./funregistermail_showusers.o: ../../../../morm/src/cursor.h
./funregistermail_showusers.o: ../../../../morm/src/jsonexpression.h
@@ -237,16 +210,25 @@
./funregistermail_showusers.o: ../../../../morm/src/postgresqlqueryresult.h
./funregistermail_showusers.o: ../../../../morm/src/xmlconnector.h
./funregistermail_showusers.o: ../../../../morm/src/transaction.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/winixmodelconnector.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/itemcontent.h
./funregistermail_showusers.o: ../../../../winix/winixd/templates/htmltextstream.h
./funregistermail_showusers.o: ../../../../winix/winixd/templates/misc.h
./funregistermail_showusers.o: ../../../../winix/winixd/templates/localefilter.h
./funregistermail_showusers.o: ../../../../winix/winixd/templates/locale.h
./funregistermail_showusers.o: ../../../../pikotools/src/space/spaceparser.h
./funregistermail_showusers.o: ../../../../pikotools/src/space/space.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/baseparser.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/winixbase.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/config.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/log.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/filelog.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/lock.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/synchro.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/error.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/user.h
./funregistermail_showusers.o: ../../../../winix/winixd/templates/misc.h
./funregistermail_showusers.o: ../../../../winix/winixd/templates/localefilter.h
./funregistermail_showusers.o: ../../../../winix/winixd/templates/locale.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/patternreplacer.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/strtoint.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/text.h
./funregistermail_showusers.o: ../../../../pikotools/src/convert/misc.h
./funregistermail_showusers.o: ../../../../ezc/src/ezc.h
./funregistermail_showusers.o: ../../../../ezc/src/version.h
./funregistermail_showusers.o: ../../../../ezc/src/generator.h
@@ -260,29 +242,18 @@
./funregistermail_showusers.o: ../../../../ezc/src/models.h
./funregistermail_showusers.o: ../../../../ezc/src/patternparser.h
./funregistermail_showusers.o: ../../../../winix/winixd/templates/htmltextstream.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/winixmodel.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/winixmodelconnector.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/group.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/dircontainer.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/winixbase.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/item.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/itemcontent.h
./funregistermail_showusers.o: ../../../../winix/winixd/templates/htmltextstream.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/ugcontainer.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/request.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/error.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/config.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/textstream.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/winixmodel.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/header.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/compress.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/winixbase.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/plugin.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/pluginmsg.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/plugindata.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/mount.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/mounts.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/request.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/mountparser.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/jobtask.h
./funregistermail_showusers.o: ../../../../winix/winixd/notify/notify.h
@@ -295,9 +266,11 @@
./funregistermail_showusers.o: ../../../../winix/winixd/core/basethread.h
./funregistermail_showusers.o: ../../../../winix/winixd/notify/templatesnotify.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/users.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/user.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/ugcontainer.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/lastcontainer.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/cur.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/request.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/session.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/rebus.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/ipban.h
@@ -314,6 +287,7 @@
./funregistermail_showusers.o: ../../../../winix/winixd/core/run.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/users.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/groups.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/group.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/image.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/threadmanager.h
./funregistermail_showusers.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -325,34 +299,22 @@
./funregistermail_showusers.o: ../../../../winix/winixd/core/ipbancontainer.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/sessionidmanager.h
./funregistermail_showusers.o: ../../../../tito/src/base64.h
./funregistermail_showusers.o: ../../../../tito/src/aes.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/slog.h
./funregistermail_showusers.o: registermail_info.h mdb.h
./funregistermail_showusers.o: ../../../../winix/winixd/db/dbbase.h
./funregistermail_showusers.o: ../../../../winix/winixd/core/dirs.h
./funregistermail_showusers.o: ../../../../tito/src/aes.h registermail_info.h
./funregistermail_showusers.o: registermail.h mdb.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/plugin.h
./init.o: ../../../../winix/winixd/core/pluginmsg.h
./init.o: ../../../../winix/winixd/core/plugindata.h
./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../winix/winixd/core/logmanipulators.h
./init.o: ../../../../pikotools/src/log/log.h
./init.o: ../../../../pikotools/src/textstream/textstream.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/date/date.h
./init.o: ../../../../pikotools/src/membuffer/membuffer.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../pikotools/src/textstream/stream_private.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/logmanipulators.h
./init.o: ../../../../pikotools/src/log/log.h
./init.o: ../../../../pikotools/src/log/filelog.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/synchro.h ../../../../morm/src/morm.h
@@ -382,18 +344,6 @@
./init.o: ../../../../morm/src/postgresqlqueryresult.h
./init.o: ../../../../morm/src/xmlconnector.h
./init.o: ../../../../morm/src/transaction.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/lock.h
./init.o: ../../../../winix/winixd/core/synchro.h
./init.o: ../../../../winix/winixd/core/mount.h mdb.h
./init.o: ../../../../winix/winixd/db/dbbase.h
./init.o: ../../../../winix/winixd/core/dirs.h funregistermail.h
./init.o: ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/db/db.h
./init.o: ../../../../winix/winixd/db/dbbase.h
./init.o: ../../../../winix/winixd/db/dbconn.h
./init.o: ../../../../winix/winixd/db/dbtextstream.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/core/misc.h
./init.o: ../../../../winix/winixd/core/requesttypes.h
./init.o: ../../../../winix/winixd/core/winix_const.h
@@ -403,10 +353,28 @@
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../pikotools/src/convert/double.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/core/plugin.h
./init.o: ../../../../winix/winixd/core/pluginmsg.h
./init.o: ../../../../winix/winixd/core/plugindata.h
./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/lock.h
./init.o: ../../../../winix/winixd/core/synchro.h
./init.o: ../../../../winix/winixd/core/mount.h mdb.h registermail.h
./init.o: funregistermail.h ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/models/item.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
./init.o: ../../../../winix/winixd/models/itemcontent.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/templates/misc.h
./init.o: ../../../../winix/winixd/templates/localefilter.h
./init.o: ../../../../winix/winixd/templates/locale.h
@@ -419,25 +387,14 @@
./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
./init.o: ../../../../ezc/src/patternparser.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/dircontainer.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/models/item.h
./init.o: ../../../../winix/winixd/models/itemcontent.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/core/header.h
./init.o: ../../../../winix/winixd/core/compress.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/plugin.h
./init.o: ../../../../winix/winixd/core/mounts.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/mountparser.h
./init.o: ../../../../winix/winixd/core/jobtask.h
./init.o: ../../../../winix/winixd/notify/notify.h
@@ -450,9 +407,11 @@
./init.o: ../../../../winix/winixd/core/basethread.h
./init.o: ../../../../winix/winixd/notify/templatesnotify.h
./init.o: ../../../../winix/winixd/core/users.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/lastcontainer.h
./init.o: ../../../../winix/winixd/core/cur.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/session.h
./init.o: ../../../../winix/winixd/core/rebus.h
./init.o: ../../../../winix/winixd/core/ipban.h
@@ -469,6 +428,7 @@
./init.o: ../../../../winix/winixd/core/run.h
./init.o: ../../../../winix/winixd/core/users.h
./init.o: ../../../../winix/winixd/core/groups.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/image.h
./init.o: ../../../../winix/winixd/core/threadmanager.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -480,11 +440,11 @@
./init.o: ../../../../winix/winixd/core/ipbancontainer.h
./init.o: ../../../../winix/winixd/core/sessionidmanager.h
./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./init.o: ../../../../winix/winixd/core/slog.h registermail_info.h
./init.o: funregistermail_showusers.h
./init.o: registermail_info.h funregistermail_showusers.h
./init.o: ../../../../winix/winixd/functions/functions.h
./init.o: ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/functions/functionparser.h
./init.o: ../../../../winix/winixd/core/dirs.h
./init.o: ../../../../winix/winixd/functions/account.h
./init.o: ../../../../winix/winixd/functions/adduser.h
./init.o: ../../../../winix/winixd/functions/cat.h
@@ -534,10 +494,84 @@
./init.o: ../../../../winix/winixd/functions/who.h
./init.o: ../../../../winix/winixd/functions/vim.h
./init.o: ../../../../pikotools/src/html/htmlparser.h
./mdb.o: mdb.h ../../../../winix/winixd/db/dbbase.h
./mdb.o: ../../../../winix/winixd/core/dirs.h
./mdb.o: ../../../../winix/winixd/core/log.h
./registermail_info.o: registermail_info.h
./init.o: ../../../../winix/winixd/models/migration.h
./mdb.o: mdb.h registermail.h ../../../../morm/src/model.h
./mdb.o: ../../../../pikotools/src/textstream/textstream.h
./mdb.o: ../../../../pikotools/src/textstream/stream.h
./mdb.o: ../../../../pikotools/src/space/space.h
./mdb.o: ../../../../pikotools/src/convert/inttostr.h
./mdb.o: ../../../../pikotools/src/convert/misc.h
./mdb.o: ../../../../pikotools/src/textstream/stream.h
./mdb.o: ../../../../pikotools/src/utf8/utf8.h
./mdb.o: ../../../../pikotools/src/date/date.h
./mdb.o: ../../../../pikotools/src/membuffer/membuffer.h
./mdb.o: ../../../../pikotools/src/textstream/types.h
./mdb.o: ../../../../pikotools/src/textstream/stream_private.h
./mdb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
./mdb.o: ../../../../morm/src/ft.h ../../../../morm/src/dbconnector.h
./mdb.o: ../../../../pikotools/src/log/log.h
./mdb.o: ../../../../pikotools/src/log/filelog.h
./mdb.o: ../../../../morm/src/queryresult.h
./mdb.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/export.h
./mdb.o: ../../../../morm/src/dbexpression.h
./mdb.o: ../../../../morm/src/baseexpression.h
./mdb.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
./mdb.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
./mdb.o: ../../../../morm/src/finderhelper.h
./mdb.o: ../../../../morm/src/fieldvaluehelper.h
./mdb.o: ../../../../morm/src/wrapper.h ../../../../morm/src/spacewrapper.h
./mdb.o: ../../../../morm/src/baseobjectwrapper.h
./mdb.o: ../../../../morm/src/modelcontainerwrapper.h
./mdb.o: ../../../../morm/src/select.h ../../../../morm/src/flatexpression.h
./mdb.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./mdb.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./mdb.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
./mdb.o: ../../../../morm/src/jsonexpression.h
./mdb.o: ../../../../morm/src/postgresqlexpression.h
./mdb.o: ../../../../morm/src/xmlexpression.h
./mdb.o: ../../../../morm/src/jsonconnector.h
./mdb.o: ../../../../morm/src/postgresqlconnector.h
./mdb.o: ../../../../morm/src/postgresqlqueryresult.h
./mdb.o: ../../../../morm/src/xmlconnector.h
./mdb.o: ../../../../morm/src/transaction.h
./registermail_info.o: registermail_info.h registermail.h
./registermail_info.o: ../../../../morm/src/model.h
./registermail_info.o: ../../../../pikotools/src/textstream/textstream.h
./registermail_info.o: ../../../../pikotools/src/textstream/stream.h
./registermail_info.o: ../../../../pikotools/src/space/space.h
./registermail_info.o: ../../../../pikotools/src/convert/inttostr.h
./registermail_info.o: ../../../../pikotools/src/convert/misc.h
./registermail_info.o: ../../../../pikotools/src/textstream/stream.h
./registermail_info.o: ../../../../pikotools/src/utf8/utf8.h
./registermail_info.o: ../../../../pikotools/src/date/date.h
./registermail_info.o: ../../../../pikotools/src/membuffer/membuffer.h
./registermail_info.o: ../../../../pikotools/src/textstream/types.h
./registermail_info.o: ../../../../pikotools/src/textstream/stream_private.h
./registermail_info.o: ../../../../morm/src/modelconnector.h
./registermail_info.o: ../../../../morm/src/clearer.h
./registermail_info.o: ../../../../morm/src/ft.h
./registermail_info.o: ../../../../morm/src/dbconnector.h
./registermail_info.o: ../../../../pikotools/src/log/log.h
./registermail_info.o: ../../../../pikotools/src/log/filelog.h
./registermail_info.o: ../../../../morm/src/queryresult.h
./registermail_info.o: ../../../../morm/src/flatconnector.h
./registermail_info.o: ../../../../morm/src/export.h
./registermail_info.o: ../../../../morm/src/dbexpression.h
./registermail_info.o: ../../../../morm/src/baseexpression.h
./registermail_info.o: ../../../../morm/src/morm_types.h
./registermail_info.o: ../../../../morm/src/modelenv.h
./registermail_info.o: ../../../../morm/src/modeldata.h
./registermail_info.o: ../../../../morm/src/cursorhelper.h
./registermail_info.o: ../../../../morm/src/finderhelper.h
./registermail_info.o: ../../../../morm/src/fieldvaluehelper.h
./registermail_info.o: ../../../../morm/src/wrapper.h
./registermail_info.o: ../../../../morm/src/spacewrapper.h
./registermail_info.o: ../../../../morm/src/baseobjectwrapper.h
./registermail_info.o: ../../../../morm/src/modelcontainerwrapper.h
./registermail_info.o: ../../../../morm/src/select.h
./registermail_info.o: ../../../../morm/src/flatexpression.h
./registermail_info.o: ../../../../ezc/src/funinfo.h
./registermail_info.o: ../../../../ezc/src/item.h
./templates.o: ../../../../winix/winixd/templates/templates.h
./templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./templates.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
@@ -552,6 +586,7 @@
./templates.o: ../../../../morm/src/spacewrapper.h
./templates.o: ../../../../pikotools/src/space/space.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../morm/src/baseobjectwrapper.h
./templates.o: ../../../../pikotools/src/date/date.h
./templates.o: ../../../../morm/src/modelcontainerwrapper.h
@@ -588,9 +623,10 @@
./templates.o: ../../../../pikotools/src/space/space.h
./templates.o: ../../../../pikotools/src/convert/baseparser.h
./templates.o: ../../../../winix/winixd/core/log.h
./templates.o: ../../../../winix/winixd/core/logmanipulators.h
./templates.o: ../../../../winix/winixd/core/filelog.h
./templates.o: ../../../../winix/winixd/core/synchro.h
./templates.o: ../../../../winix/winixd/core/log.h
./templates.o: ../../../../winix/winixd/core/logmanipulators.h
./templates.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h
./templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
./templates.o: ../../../../morm/src/jsonexpression.h
@@ -601,7 +637,6 @@
./templates.o: ../../../../morm/src/postgresqlqueryresult.h
./templates.o: ../../../../morm/src/xmlconnector.h
./templates.o: ../../../../morm/src/transaction.h
./templates.o: ../../../../winix/winixd/core/log.h
./templates.o: ../../../../winix/winixd/core/filelog.h
./templates.o: ../../../../winix/winixd/core/lock.h
./templates.o: ../../../../winix/winixd/core/synchro.h
@@ -614,6 +649,9 @@
./templates.o: ../../../../winix/winixd/templates/localefilter.h
./templates.o: ../../../../winix/winixd/templates/locale.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/strtoint.h
./templates.o: ../../../../pikotools/src/convert/text.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../winix/winixd/templates/htmltextstream.h
./templates.o: ../../../../winix/winixd/templates/indexpatterns.h
./templates.o: ../../../../winix/winixd/templates/patterns.h
@@ -631,36 +669,16 @@
./templates.o: ../../../../winix/winixd/core/plugindata.h
./templates.o: ../../../../winix/winixd/core/rebus.h
./templates.o: ../../../../winix/winixd/core/winixbase.h
./templates.o: ../../../../winix/winixd/core/textstream.h
./templates.o: ../../../../winix/winixd/core/ipban.h
./templates.o: ../../../../winix/winixd/core/mount.h
./templates.o: ../../../../winix/winixd/core/loadavg.h
./templates.o: ../../../../winix/winixd/core/mounts.h
./templates.o: ../../../../winix/winixd/db/db.h
./templates.o: ../../../../winix/winixd/db/dbbase.h
./templates.o: ../../../../winix/winixd/db/dbconn.h
./templates.o: ../../../../winix/winixd/db/dbtextstream.h
./templates.o: ../../../../winix/winixd/core/textstream.h
./templates.o: ../../../../winix/winixd/core/misc.h
./templates.o: ../../../../winix/winixd/core/requesttypes.h
./templates.o: ../../../../winix/winixd/core/winix_const.h
./templates.o: ../../../../pikotools/src/convert/convert.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/strtoint.h
./templates.o: ../../../../pikotools/src/convert/text.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../pikotools/src/textstream/types.h
./templates.o: ../../../../pikotools/src/convert/double.h
./templates.o: ../../../../winix/winixd/core/error.h
./templates.o: ../../../../winix/winixd/models/group.h
./templates.o: ../../../../winix/winixd/core/dircontainer.h
./templates.o: ../../../../winix/winixd/core/ugcontainer.h
./templates.o: ../../../../winix/winixd/core/mountparser.h
./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./templates.o: ../../../../winix/winixd/requestjobs/requestjobbase.h
./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./templates.o: ../../../../winix/winixd/core/request.h
./templates.o: ../../../../winix/winixd/core/requesttypes.h
./templates.o: ../../../../winix/winixd/core/config.h
./templates.o: ../../../../winix/winixd/models/winixmodel.h
./templates.o: ../../../../winix/winixd/core/header.h
@@ -673,6 +691,7 @@
./templates.o: ../../../../winix/winixd/core/run.h
./templates.o: ../../../../winix/winixd/core/users.h
./templates.o: ../../../../winix/winixd/core/groups.h
./templates.o: ../../../../winix/winixd/models/group.h
./templates.o: ../../../../winix/winixd/core/ugcontainer.h
./templates.o: ../../../../winix/winixd/core/image.h
./templates.o: ../../../../winix/winixd/core/threadmanager.h
@@ -696,6 +715,46 @@
./templates.o: ../../../../pikotools/src/html/htmlparser.h
./templates.o: ../../../../winix/winixd/core/winixrequest.h
./templates.o: ../../../../winix/winixd/core/winixsystem.h
./templates.o: ../../../../winix/winixd/core/slog.h
./templates.o: ../../../../winix/winixd/core/plugin.h
./templates.o: ../../../../winix/winixd/core/misc.h registermail_info.h
./templates.o: ../../../../winix/winixd/core/misc.h
./templates.o: ../../../../winix/winixd/core/winix_const.h
./templates.o: ../../../../pikotools/src/convert/convert.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/double.h registermail_info.h
./templates.o: registermail.h
./registermail.o: registermail.h ../../../../morm/src/model.h
./registermail.o: ../../../../pikotools/src/textstream/textstream.h
./registermail.o: ../../../../pikotools/src/textstream/stream.h
./registermail.o: ../../../../pikotools/src/space/space.h
./registermail.o: ../../../../pikotools/src/convert/inttostr.h
./registermail.o: ../../../../pikotools/src/convert/misc.h
./registermail.o: ../../../../pikotools/src/textstream/stream.h
./registermail.o: ../../../../pikotools/src/utf8/utf8.h
./registermail.o: ../../../../pikotools/src/date/date.h
./registermail.o: ../../../../pikotools/src/membuffer/membuffer.h
./registermail.o: ../../../../pikotools/src/textstream/types.h
./registermail.o: ../../../../pikotools/src/textstream/stream_private.h
./registermail.o: ../../../../morm/src/modelconnector.h
./registermail.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./registermail.o: ../../../../morm/src/dbconnector.h
./registermail.o: ../../../../pikotools/src/log/log.h
./registermail.o: ../../../../pikotools/src/log/filelog.h
./registermail.o: ../../../../morm/src/queryresult.h
./registermail.o: ../../../../morm/src/flatconnector.h
./registermail.o: ../../../../morm/src/export.h
./registermail.o: ../../../../morm/src/dbexpression.h
./registermail.o: ../../../../morm/src/baseexpression.h
./registermail.o: ../../../../morm/src/morm_types.h
./registermail.o: ../../../../morm/src/modelenv.h
./registermail.o: ../../../../morm/src/modeldata.h
./registermail.o: ../../../../morm/src/cursorhelper.h
./registermail.o: ../../../../morm/src/finderhelper.h
./registermail.o: ../../../../morm/src/fieldvaluehelper.h
./registermail.o: ../../../../morm/src/wrapper.h
./registermail.o: ../../../../morm/src/spacewrapper.h
./registermail.o: ../../../../morm/src/baseobjectwrapper.h
./registermail.o: ../../../../morm/src/modelcontainerwrapper.h
./registermail.o: ../../../../morm/src/select.h
./registermail.o: ../../../../morm/src/flatexpression.h
./registermail.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016, Tomasz Sowa
* Copyright (c) 2016-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,6 +33,7 @@
*/
#include "funregistermail.h"
#include "core/misc.h"
namespace Winix
{
@@ -89,14 +90,14 @@ void FunRegisterMail::MakeGet()
if( ValidateEmail(mail) )
{
log << log3 << "RM: registering e-mail address: " << mail << logend;
slog << loginfo << "Thank you, your e-mail address has been added to our list" << logend;
//slog << loginfo << "Thank you, your e-mail address has been added to our list" << logend;
pmdb->AddMail(list_id, mail);
pmdb->AddMail(model_connector, list_id, mail);
}
else
{
log << log2 << "RM: email: " << mail << " doesn't seem to be correct (skipping)" << logend;
slog << logerror << "Sorry but the e-mail address: " << mail << " doesn't seem to be correct" << logend;
//slog << logerror << "Sorry but the e-mail address: " << mail << " doesn't seem to be correct" << logend;
}
}
else

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016, Tomasz Sowa
* Copyright (c) 2016-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,9 +79,7 @@ void FunRegisterMailShowUsers::MakePost()
void FunRegisterMailShowUsers::MakeGet()
{
pmdb->GetUsers(pinfo->mail_list);
pmdb->GetUsers(model_connector, pinfo->mail_list);
}

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016-2021, Tomasz Sowa
* Copyright (c) 2016-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,12 +34,15 @@
#include "core/log.h"
#include "core/misc.h"
#include "core/plugin.h"
#include "mdb.h"
#include "funregistermail.h"
#include "registermail_info.h"
#include "funregistermail_showusers.h"
#include "functions/functions.h"
#include "models/migration.h"
namespace Winix
@@ -158,6 +161,19 @@ void InitPlugin(PluginInfo & info)
}
void DatabaseMigration(PluginInfo & info)
{
bool ok = true;
RegisterMail register_mail;
ok = ok && Migration::do_migration(info.model_connector, register_mail);
info.res = ok;
}
void AddEzcFunctions(PluginInfo & info);
} // namespace
@@ -170,25 +186,20 @@ void Init(PluginInfo & info)
{
using namespace MailRegister;
mdb.SetConn(info.db->GetConn());
mdb.LogQueries(info.config->log_db_query);
fun_rm.SetMDb(&mdb);
fun_rm.SetInfo(&rm_info);
fun_rm_showusers.SetMDb(&mdb);
fun_rm_showusers.SetInfo(&rm_info);
info.plugin->Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
info.plugin->Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
info.plugin->Assign(WINIX_MAKE_DATABASE_MIGRATION, DatabaseMigration);
info.plugin->Assign(WINIX_CREATE_FUNCTIONS, AddWinixFunctions);
info.plugin->Assign(WINIX_PLUGIN_INIT, InitPlugin);
info.plugin->Assign(WINIX_PROCESS_REQUEST, ProcessRequest);
info.p1 = (void*)(plugin_name);
}

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016, Tomasz Sowa
* Copyright (c) 2016-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
*/
#include "mdb.h"
#include "core/log.h"
#include "morm.h"
namespace Winix
@@ -43,79 +43,27 @@ namespace MailRegister
bool MDb::AddMail(int list_id, const std::wstring & mail)
bool MDb::AddMail(morm::ModelConnector * model_connector, int list_id, const std::wstring & mail)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
RegisterMail r;
r.set_connector(model_connector);
r.clear();
r.list_id = list_id;
r.mail = mail;
try
{
query.Clear();
query << R("insert into plugins.registermail (list_id, mail) values (")
<< list_id
<< mail
<< R(");");
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
//.id = AssertCurrval("core.user_id_seq");
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status == WINIX_ERR_OK;
return r.insert();
}
bool MDb::GetUsers(std::vector<std::wstring> & container, bool clear_container)
void MDb::GetUsers(morm::ModelConnector * model_connector, std::vector<RegisterMail> & container)
{
PGresult * r = 0;
Error result = WINIX_ERR_OK;
container.clear();
try
{
query.Clear();
query << R("select * from plugins.registermail")
<< R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
int rows = Rows(r);
for(int i=0 ; i < rows ; ++i)
{
AssertValueWide(r, i, 0, mail);
container.push_back(mail);
}
}
catch(const Error & e)
{
result = e;
}
ClearResult(r);
return result == WINIX_ERR_OK;
morm::Finder<RegisterMail> finder(model_connector);
finder.select().get_vector(container);
}
}
} // namespace Winix

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016, Tomasz Sowa
* Copyright (c) 2016-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,42 +37,25 @@
#include <string>
#include <vector>
#include "db/dbbase.h"
#include "core/dirs.h"
#include "registermail.h"
namespace Winix
namespace Winix::MailRegister
{
namespace MailRegister
{
class MDb : public DbBase
class MDb
{
public:
bool AddMail(int list_id, const std::wstring & mail);
bool GetUsers(std::vector<std::wstring> & container, bool clear_container = true);
bool AddMail(morm::ModelConnector * model_connector, int list_id, const std::wstring & mail);
void GetUsers(morm::ModelConnector * model_connector, std::vector<RegisterMail> & container);
private:
DbTextStream query;
std::wstring mail;
};
}
} // namespace Winix
#endif

View File

@@ -0,0 +1,89 @@
/*
* This file is a part of Winix
* and is distributed under the 2-Clause BSD licence.
* Author: Tomasz Sowa <t.sowa@ttmath.org>
*/
/*
* Copyright (c) 2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "registermail.h"
namespace Winix::MailRegister
{
void RegisterMail::fields()
{
field(L"mail", mail);
field(L"list_id", list_id);
}
void RegisterMail::after_insert()
{
//get_last_sequence_for_primary_key(L"", id);
}
void RegisterMail::table()
{
table_name(L"plugins", L"registermail");
}
bool RegisterMail::do_migration(int & current_table_version)
{
bool ok = true;
ok = ok && morm::Model::do_migration(current_table_version, 1, this, &RegisterMail::do_migration_to_1);
return ok;
}
bool RegisterMail::do_migration_to_1()
{
const char * str = R"sql(
CREATE TABLE plugins.registermail (
mail character varying(255),
list_id integer
);
)sql";
return db_query(str);
}
}

View File

@@ -0,0 +1,73 @@
/*
* This file is a part of Winix
* and is distributed under the 2-Clause BSD licence.
* Author: Tomasz Sowa <t.sowa@ttmath.org>
*/
/*
* Copyright (c) 2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef headerfile_winix_plugins_mailregister_registermail
#define headerfile_winix_plugins_mailregister_registermail
#include <string>
#include "model.h"
namespace Winix::MailRegister
{
class RegisterMail : public morm::Model
{
public:
std::wstring mail;
long list_id; // change in the database to bigint
void table();
protected:
void fields();
void after_insert();
bool do_migration(int & current_table_version);
bool do_migration_to_1();
};
}
#endif

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016, Tomasz Sowa
* Copyright (c) 2016-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,9 @@
#include "registermail_info.h"
namespace Winix::MailRegister
{
bool RegisterMailInfo::HasListId(int id)
{
@@ -42,5 +45,8 @@ bool RegisterMailInfo::HasListId(int id)
}
}

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016, Tomasz Sowa
* Copyright (c) 2016-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,14 +38,18 @@
#include <string>
#include <vector>
#include <map>
#include "registermail.h"
namespace Winix::MailRegister
{
class RegisterMailInfo
{
public:
std::vector<std::wstring> mail_list;
std::vector<RegisterMail> mail_list;
// list_id -> config_file (without dir)
std::map<int, std::wstring> lists;
@@ -56,4 +60,7 @@ public:
};
}
#endif

View File

@@ -7,8 +7,9 @@
./cache.o: ../../../../pikotools/src/space/spaceparser.h
./cache.o: ../../../../pikotools/src/space/space.h
./cache.o: ../../../../pikotools/src/convert/inttostr.h
./cache.o: ../../../../pikotools/src/utf8/utf8.h
./cache.o: ../../../../pikotools/src/convert/misc.h
./cache.o: ../../../../pikotools/src/textstream/stream.h
./cache.o: ../../../../pikotools/src/utf8/utf8.h
./cache.o: ../../../../pikotools/src/convert/baseparser.h
./cache.o: ../../../../pikotools/src/textstream/textstream.h
./cache.o: ../../../../pikotools/src/textstream/stream.h
@@ -67,36 +68,18 @@
./cache.o: ../../../../pikotools/src/convert/patternreplacer.h
./cache.o: ../../../../pikotools/src/convert/strtoint.h
./cache.o: ../../../../pikotools/src/convert/text.h
./cache.o: ../../../../pikotools/src/convert/misc.h
./cache.o: ../../../../pikotools/src/textstream/types.h
./cache.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./cache.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./cache.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/functions.h
./cache.o: ../../../../ezc/src/objects.h ../../../../ezc/src/outstreams.h
./cache.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
./cache.o: ../../../../ezc/src/version.h ../../../../ezc/src/generator.h
./cache.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/pattern.h
./cache.o: ../../../../ezc/src/functions.h ../../../../ezc/src/objects.h
./cache.o: ../../../../ezc/src/outstreams.h
./cache.o: ../../../../ezc/src/expressionparser.h
./cache.o: ../../../../ezc/src/models.h ../../../../ezc/src/patternparser.h
./cache.o: ../../../../winix/winixd/templates/htmltextstream.h
./cache.o: ../../../../winix/winixd/db/db.h
./cache.o: ../../../../winix/winixd/db/dbbase.h
./cache.o: ../../../../winix/winixd/db/dbconn.h
./cache.o: ../../../../winix/winixd/db/dbtextstream.h
./cache.o: ../../../../winix/winixd/core/textstream.h
./cache.o: ../../../../winix/winixd/core/misc.h
./cache.o: ../../../../winix/winixd/core/requesttypes.h
./cache.o: ../../../../winix/winixd/core/winix_const.h
./cache.o: ../../../../pikotools/src/convert/convert.h
./cache.o: ../../../../pikotools/src/convert/inttostr.h
./cache.o: ../../../../pikotools/src/convert/patternreplacer.h
./cache.o: ../../../../pikotools/src/convert/double.h
./cache.o: ../../../../winix/winixd/core/error.h
./cache.o: ../../../../winix/winixd/models/user.h
./cache.o: ../../../../winix/winixd/models/group.h
./cache.o: ../../../../winix/winixd/core/dircontainer.h
./cache.o: ../../../../winix/winixd/core/ugcontainer.h
./cache.o: ../../../../winix/winixd/core/request.h
./cache.o: ../../../../winix/winixd/core/requesttypes.h
./cache.o: ../../../../winix/winixd/core/error.h
./cache.o: ../../../../winix/winixd/core/config.h
./cache.o: ../../../../winix/winixd/core/textstream.h
./cache.o: ../../../../winix/winixd/models/winixmodel.h
./cache.o: ../../../../winix/winixd/core/header.h
./cache.o: ../../../../winix/winixd/core/compress.h
@@ -109,6 +92,11 @@
./cache.o: ../../../../winix/winixd/core/mountparser.h
./cache.o: ../../../../winix/winixd/core/jobtask.h
./cache.o: ../../../../winix/winixd/core/misc.h
./cache.o: ../../../../winix/winixd/core/winix_const.h
./cache.o: ../../../../pikotools/src/convert/convert.h
./cache.o: ../../../../pikotools/src/convert/inttostr.h
./cache.o: ../../../../pikotools/src/convert/patternreplacer.h
./cache.o: ../../../../pikotools/src/convert/double.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/plugin.h
./init.o: ../../../../winix/winixd/core/pluginmsg.h
@@ -161,6 +149,7 @@
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -180,36 +169,18 @@
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./init.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/functions.h
./init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/outstreams.h
./init.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
./init.o: ../../../../ezc/src/version.h ../../../../ezc/src/generator.h
./init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/pattern.h
./init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/objects.h
./init.o: ../../../../ezc/src/outstreams.h
./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
./init.o: ../../../../ezc/src/patternparser.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/db/db.h
./init.o: ../../../../winix/winixd/db/dbbase.h
./init.o: ../../../../winix/winixd/db/dbconn.h
./init.o: ../../../../winix/winixd/db/dbtextstream.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/core/misc.h
./init.o: ../../../../winix/winixd/core/requesttypes.h
./init.o: ../../../../winix/winixd/core/winix_const.h
./init.o: ../../../../pikotools/src/convert/convert.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../pikotools/src/convert/double.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/dircontainer.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/requesttypes.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/core/header.h
./init.o: ../../../../winix/winixd/core/compress.h
@@ -225,6 +196,7 @@
./init.o: ../../../../winix/winixd/templates/changepatterns.h
./init.o: ../../../../winix/winixd/core/cur.h
./init.o: ../../../../winix/winixd/core/session.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/core/rebus.h
./init.o: ../../../../winix/winixd/core/ipban.h
./init.o: ../../../../winix/winixd/core/system.h
@@ -242,6 +214,7 @@
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/lastcontainer.h
./init.o: ../../../../winix/winixd/core/groups.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/image.h
./init.o: ../../../../winix/winixd/core/threadmanager.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -263,7 +236,6 @@
./init.o: ../../../../pikotools/src/html/htmlparser.h
./init.o: ../../../../winix/winixd/core/winixrequest.h
./init.o: ../../../../winix/winixd/core/winixsystem.h
./init.o: ../../../../winix/winixd/core/slog.h
./init.o: ../../../../winix/winixd/functions/functions.h
./init.o: ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/functions/functionparser.h
@@ -326,8 +298,9 @@
./templates.o: ../../../../pikotools/src/space/spaceparser.h
./templates.o: ../../../../pikotools/src/space/space.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/utf8/utf8.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../pikotools/src/textstream/stream.h
./templates.o: ../../../../pikotools/src/utf8/utf8.h
./templates.o: ../../../../pikotools/src/convert/baseparser.h
./templates.o: ../../../../pikotools/src/textstream/textstream.h
./templates.o: ../../../../pikotools/src/textstream/stream.h
@@ -390,29 +363,11 @@
./templates.o: ../../../../pikotools/src/convert/strtoint.h
./templates.o: ../../../../pikotools/src/convert/text.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../pikotools/src/textstream/types.h
./templates.o: ../../../../winix/winixd/templates/htmltextstream.h
./templates.o: ../../../../winix/winixd/db/db.h
./templates.o: ../../../../winix/winixd/db/dbbase.h
./templates.o: ../../../../winix/winixd/db/dbconn.h
./templates.o: ../../../../winix/winixd/db/dbtextstream.h
./templates.o: ../../../../winix/winixd/core/textstream.h
./templates.o: ../../../../winix/winixd/core/misc.h
./templates.o: ../../../../winix/winixd/core/requesttypes.h
./templates.o: ../../../../winix/winixd/core/winix_const.h
./templates.o: ../../../../pikotools/src/convert/convert.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/double.h
./templates.o: ../../../../winix/winixd/core/error.h
./templates.o: ../../../../winix/winixd/models/user.h
./templates.o: ../../../../winix/winixd/models/group.h
./templates.o: ../../../../winix/winixd/core/dircontainer.h
./templates.o: ../../../../winix/winixd/core/ugcontainer.h
./templates.o: ../../../../winix/winixd/core/request.h
./templates.o: ../../../../winix/winixd/core/requesttypes.h
./templates.o: ../../../../winix/winixd/core/error.h
./templates.o: ../../../../winix/winixd/core/config.h
./templates.o: ../../../../winix/winixd/core/textstream.h
./templates.o: ../../../../ezc/src/outstreams.h ../../../../ezc/src/models.h
./templates.o: ../../../../winix/winixd/models/winixmodel.h
./templates.o: ../../../../winix/winixd/core/header.h
@@ -436,6 +391,7 @@
./templates.o: ../../../../winix/winixd/templates/changepatterns.h
./templates.o: ../../../../winix/winixd/core/cur.h
./templates.o: ../../../../winix/winixd/core/session.h
./templates.o: ../../../../winix/winixd/models/user.h
./templates.o: ../../../../winix/winixd/core/rebus.h
./templates.o: ../../../../winix/winixd/core/ipban.h
./templates.o: ../../../../winix/winixd/core/system.h
@@ -453,6 +409,7 @@
./templates.o: ../../../../winix/winixd/core/ugcontainer.h
./templates.o: ../../../../winix/winixd/core/lastcontainer.h
./templates.o: ../../../../winix/winixd/core/groups.h
./templates.o: ../../../../winix/winixd/models/group.h
./templates.o: ../../../../winix/winixd/core/image.h
./templates.o: ../../../../winix/winixd/core/threadmanager.h
./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -474,6 +431,10 @@
./templates.o: ../../../../pikotools/src/html/htmlparser.h
./templates.o: ../../../../winix/winixd/core/winixrequest.h
./templates.o: ../../../../winix/winixd/core/winixsystem.h
./templates.o: ../../../../winix/winixd/core/slog.h
./templates.o: ../../../../winix/winixd/core/plugin.h
./templates.o: ../../../../winix/winixd/core/misc.h
./templates.o: ../../../../winix/winixd/core/winix_const.h
./templates.o: ../../../../pikotools/src/convert/convert.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/double.h

View File

@@ -1,52 +1,32 @@
# DO NOT DELETE
./init.o: seo.h ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/db/db.h
./init.o: ../../../../winix/winixd/db/dbbase.h
./init.o: ../../../../winix/winixd/db/dbconn.h
./init.o: ../../../../winix/winixd/db/dbtextstream.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/core/misc.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/requesttypes.h
./init.o: ../../../../pikotools/src/textstream/textstream.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/date/date.h
./init.o: ../../../../pikotools/src/membuffer/membuffer.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../pikotools/src/textstream/stream_private.h
./init.o: ../../../../winix/winixd/core/winix_const.h
./init.o: ../../../../pikotools/src/convert/convert.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../pikotools/src/convert/double.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/logmanipulators.h
./init.o: ../../../../pikotools/src/log/log.h
./init.o: ../../../../pikotools/src/log/filelog.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/synchro.h ../../../../morm/src/morm.h
./init.o: ../../../../morm/src/version.h ../../../../morm/src/morm_types.h
./init.o: ../../../../winix/winixd/models/item.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
./init.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./init.o: ../../../../morm/src/dbconnector.h
./init.o: ../../../../pikotools/src/log/log.h
./init.o: ../../../../pikotools/src/log/filelog.h
./init.o: ../../../../morm/src/queryresult.h
./init.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/export.h
./init.o: ../../../../morm/src/dbexpression.h
./init.o: ../../../../morm/src/baseexpression.h
./init.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
./init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
./init.o: ../../../../morm/src/modeldata.h
./init.o: ../../../../morm/src/cursorhelper.h
./init.o: ../../../../morm/src/finderhelper.h
./init.o: ../../../../morm/src/fieldvaluehelper.h
@@ -55,8 +35,12 @@
./init.o: ../../../../morm/src/modelcontainerwrapper.h
./init.o: ../../../../morm/src/select.h ../../../../morm/src/flatexpression.h
./init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./init.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
./init.o: ../../../../morm/src/jsonexpression.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/logmanipulators.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/synchro.h ../../../../morm/src/morm.h
./init.o: ../../../../morm/src/version.h ../../../../morm/src/finder.h
./init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
./init.o: ../../../../morm/src/postgresqlexpression.h
./init.o: ../../../../morm/src/xmlexpression.h
./init.o: ../../../../morm/src/jsonconnector.h
@@ -64,47 +48,44 @@
./init.o: ../../../../morm/src/postgresqlqueryresult.h
./init.o: ../../../../morm/src/xmlconnector.h
./init.o: ../../../../morm/src/transaction.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
./init.o: ../../../../winix/winixd/models/itemcontent.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/templates/misc.h
./init.o: ../../../../winix/winixd/templates/localefilter.h
./init.o: ../../../../winix/winixd/templates/locale.h
./init.o: ../../../../pikotools/src/space/spaceparser.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/baseparser.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/log.h
./init.o: ../../../../winix/winixd/core/filelog.h
./init.o: ../../../../winix/winixd/core/lock.h
./init.o: ../../../../winix/winixd/core/synchro.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/templates/misc.h
./init.o: ../../../../winix/winixd/templates/localefilter.h
./init.o: ../../../../winix/winixd/templates/locale.h
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./init.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
./init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
./init.o: ../../../../ezc/src/outstreams.h
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
./init.o: ../../../../ezc/src/version.h ../../../../ezc/src/generator.h
./init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
./init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/objects.h
./init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
./init.o: ../../../../ezc/src/patternparser.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/dircontainer.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/models/item.h
./init.o: ../../../../winix/winixd/models/itemcontent.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/core/header.h
./init.o: ../../../../winix/winixd/core/compress.h
./init.o: ../../../../winix/winixd/core/winixbase.h
./init.o: ../../../../winix/winixd/core/plugin.h
./init.o: ../../../../winix/winixd/core/pluginmsg.h
./init.o: ../../../../winix/winixd/core/plugindata.h
./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./init.o: ../../../../winix/winixd/core/mount.h
./init.o: ../../../../winix/winixd/core/mounts.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/mountparser.h
./init.o: ../../../../winix/winixd/core/jobtask.h
./init.o: ../../../../winix/winixd/notify/notify.h
@@ -117,9 +98,11 @@
./init.o: ../../../../winix/winixd/core/basethread.h
./init.o: ../../../../winix/winixd/notify/templatesnotify.h
./init.o: ../../../../winix/winixd/core/users.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/lastcontainer.h
./init.o: ../../../../winix/winixd/core/cur.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/session.h
./init.o: ../../../../winix/winixd/core/rebus.h
./init.o: ../../../../winix/winixd/core/ipban.h
@@ -136,6 +119,7 @@
./init.o: ../../../../winix/winixd/core/run.h
./init.o: ../../../../winix/winixd/core/users.h
./init.o: ../../../../winix/winixd/core/groups.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/image.h
./init.o: ../../../../winix/winixd/core/threadmanager.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -147,7 +131,6 @@
./init.o: ../../../../winix/winixd/core/ipbancontainer.h
./init.o: ../../../../winix/winixd/core/sessionidmanager.h
./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./init.o: ../../../../winix/winixd/core/slog.h
./init.o: ../../../../winix/winixd/functions/functions.h
./init.o: ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/functions/functionparser.h
@@ -202,53 +185,32 @@
./init.o: ../../../../winix/winixd/functions/vim.h
./init.o: ../../../../pikotools/src/html/htmlparser.h
./seo.o: seo.h ../../../../winix/winixd/functions/functionbase.h
./seo.o: ../../../../winix/winixd/db/db.h
./seo.o: ../../../../winix/winixd/db/dbbase.h
./seo.o: ../../../../winix/winixd/db/dbconn.h
./seo.o: ../../../../winix/winixd/db/dbtextstream.h
./seo.o: ../../../../winix/winixd/core/textstream.h
./seo.o: ../../../../winix/winixd/core/misc.h
./seo.o: ../../../../winix/winixd/core/request.h
./seo.o: ../../../../winix/winixd/core/requesttypes.h
./seo.o: ../../../../pikotools/src/textstream/textstream.h
./seo.o: ../../../../pikotools/src/textstream/stream.h
./seo.o: ../../../../pikotools/src/space/space.h
./seo.o: ../../../../pikotools/src/convert/inttostr.h
./seo.o: ../../../../pikotools/src/utf8/utf8.h
./seo.o: ../../../../pikotools/src/convert/misc.h
./seo.o: ../../../../pikotools/src/textstream/stream.h
./seo.o: ../../../../pikotools/src/utf8/utf8.h
./seo.o: ../../../../pikotools/src/date/date.h
./seo.o: ../../../../pikotools/src/membuffer/membuffer.h
./seo.o: ../../../../pikotools/src/textstream/types.h
./seo.o: ../../../../pikotools/src/textstream/stream_private.h
./seo.o: ../../../../winix/winixd/core/winix_const.h
./seo.o: ../../../../pikotools/src/convert/convert.h
./seo.o: ../../../../pikotools/src/convert/inttostr.h
./seo.o: ../../../../pikotools/src/convert/patternreplacer.h
./seo.o: ../../../../pikotools/src/convert/strtoint.h
./seo.o: ../../../../pikotools/src/convert/text.h
./seo.o: ../../../../pikotools/src/convert/misc.h
./seo.o: ../../../../pikotools/src/textstream/types.h
./seo.o: ../../../../pikotools/src/convert/double.h
./seo.o: ../../../../winix/winixd/core/winixbase.h
./seo.o: ../../../../winix/winixd/core/config.h
./seo.o: ../../../../pikotools/src/space/spaceparser.h
./seo.o: ../../../../pikotools/src/space/space.h
./seo.o: ../../../../pikotools/src/convert/baseparser.h
./seo.o: ../../../../winix/winixd/core/log.h
./seo.o: ../../../../winix/winixd/core/logmanipulators.h
./seo.o: ../../../../pikotools/src/log/log.h
./seo.o: ../../../../pikotools/src/log/filelog.h
./seo.o: ../../../../winix/winixd/core/filelog.h
./seo.o: ../../../../winix/winixd/core/synchro.h ../../../../morm/src/morm.h
./seo.o: ../../../../morm/src/version.h ../../../../morm/src/morm_types.h
./seo.o: ../../../../winix/winixd/models/item.h
./seo.o: ../../../../winix/winixd/models/winixmodel.h
./seo.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
./seo.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h
./seo.o: ../../../../morm/src/dbconnector.h
./seo.o: ../../../../pikotools/src/log/log.h
./seo.o: ../../../../pikotools/src/log/filelog.h
./seo.o: ../../../../morm/src/queryresult.h
./seo.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/export.h
./seo.o: ../../../../morm/src/dbexpression.h
./seo.o: ../../../../morm/src/baseexpression.h
./seo.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
./seo.o: ../../../../morm/src/cursorhelper.h
./seo.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
./seo.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
./seo.o: ../../../../morm/src/finderhelper.h
./seo.o: ../../../../morm/src/fieldvaluehelper.h
./seo.o: ../../../../morm/src/wrapper.h ../../../../morm/src/spacewrapper.h
@@ -256,8 +218,12 @@
./seo.o: ../../../../morm/src/modelcontainerwrapper.h
./seo.o: ../../../../morm/src/select.h ../../../../morm/src/flatexpression.h
./seo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/item.h
./seo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
./seo.o: ../../../../morm/src/jsonexpression.h
./seo.o: ../../../../winix/winixd/core/log.h
./seo.o: ../../../../winix/winixd/core/logmanipulators.h
./seo.o: ../../../../winix/winixd/core/filelog.h
./seo.o: ../../../../winix/winixd/core/synchro.h ../../../../morm/src/morm.h
./seo.o: ../../../../morm/src/version.h ../../../../morm/src/finder.h
./seo.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
./seo.o: ../../../../morm/src/postgresqlexpression.h
./seo.o: ../../../../morm/src/xmlexpression.h
./seo.o: ../../../../morm/src/jsonconnector.h
@@ -265,47 +231,44 @@
./seo.o: ../../../../morm/src/postgresqlqueryresult.h
./seo.o: ../../../../morm/src/xmlconnector.h
./seo.o: ../../../../morm/src/transaction.h
./seo.o: ../../../../winix/winixd/models/winixmodelconnector.h
./seo.o: ../../../../winix/winixd/models/itemcontent.h
./seo.o: ../../../../winix/winixd/templates/htmltextstream.h
./seo.o: ../../../../winix/winixd/templates/misc.h
./seo.o: ../../../../winix/winixd/templates/localefilter.h
./seo.o: ../../../../winix/winixd/templates/locale.h
./seo.o: ../../../../pikotools/src/space/spaceparser.h
./seo.o: ../../../../pikotools/src/space/space.h
./seo.o: ../../../../pikotools/src/convert/baseparser.h
./seo.o: ../../../../winix/winixd/core/winixbase.h
./seo.o: ../../../../winix/winixd/core/config.h
./seo.o: ../../../../winix/winixd/core/log.h
./seo.o: ../../../../winix/winixd/core/filelog.h
./seo.o: ../../../../winix/winixd/core/lock.h
./seo.o: ../../../../winix/winixd/core/synchro.h
./seo.o: ../../../../winix/winixd/core/error.h
./seo.o: ../../../../winix/winixd/models/user.h
./seo.o: ../../../../winix/winixd/templates/misc.h
./seo.o: ../../../../winix/winixd/templates/localefilter.h
./seo.o: ../../../../winix/winixd/templates/locale.h
./seo.o: ../../../../pikotools/src/convert/patternreplacer.h
./seo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./seo.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./seo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
./seo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
./seo.o: ../../../../ezc/src/outstreams.h
./seo.o: ../../../../pikotools/src/convert/strtoint.h
./seo.o: ../../../../pikotools/src/convert/text.h
./seo.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
./seo.o: ../../../../ezc/src/version.h ../../../../ezc/src/generator.h
./seo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
./seo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/objects.h
./seo.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
./seo.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
./seo.o: ../../../../ezc/src/patternparser.h
./seo.o: ../../../../winix/winixd/templates/htmltextstream.h
./seo.o: ../../../../winix/winixd/models/winixmodel.h
./seo.o: ../../../../winix/winixd/models/winixmodelconnector.h
./seo.o: ../../../../winix/winixd/models/group.h
./seo.o: ../../../../winix/winixd/core/dircontainer.h
./seo.o: ../../../../winix/winixd/core/winixbase.h
./seo.o: ../../../../winix/winixd/models/item.h
./seo.o: ../../../../winix/winixd/models/itemcontent.h
./seo.o: ../../../../winix/winixd/templates/htmltextstream.h
./seo.o: ../../../../winix/winixd/core/ugcontainer.h
./seo.o: ../../../../winix/winixd/core/request.h
./seo.o: ../../../../winix/winixd/core/error.h
./seo.o: ../../../../winix/winixd/core/config.h
./seo.o: ../../../../winix/winixd/core/textstream.h
./seo.o: ../../../../winix/winixd/models/winixmodel.h
./seo.o: ../../../../winix/winixd/core/header.h
./seo.o: ../../../../winix/winixd/core/compress.h
./seo.o: ../../../../winix/winixd/core/winixbase.h
./seo.o: ../../../../winix/winixd/core/plugin.h
./seo.o: ../../../../winix/winixd/core/pluginmsg.h
./seo.o: ../../../../winix/winixd/core/plugindata.h
./seo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./seo.o: ../../../../winix/winixd/core/mount.h
./seo.o: ../../../../winix/winixd/core/mounts.h
./seo.o: ../../../../winix/winixd/core/request.h
./seo.o: ../../../../winix/winixd/core/mountparser.h
./seo.o: ../../../../winix/winixd/core/jobtask.h
./seo.o: ../../../../winix/winixd/notify/notify.h
@@ -318,9 +281,11 @@
./seo.o: ../../../../winix/winixd/core/basethread.h
./seo.o: ../../../../winix/winixd/notify/templatesnotify.h
./seo.o: ../../../../winix/winixd/core/users.h
./seo.o: ../../../../winix/winixd/models/user.h
./seo.o: ../../../../winix/winixd/core/ugcontainer.h
./seo.o: ../../../../winix/winixd/core/lastcontainer.h
./seo.o: ../../../../winix/winixd/core/cur.h
./seo.o: ../../../../winix/winixd/core/request.h
./seo.o: ../../../../winix/winixd/core/session.h
./seo.o: ../../../../winix/winixd/core/rebus.h
./seo.o: ../../../../winix/winixd/core/ipban.h
@@ -337,6 +302,7 @@
./seo.o: ../../../../winix/winixd/core/run.h
./seo.o: ../../../../winix/winixd/core/users.h
./seo.o: ../../../../winix/winixd/core/groups.h
./seo.o: ../../../../winix/winixd/models/group.h
./seo.o: ../../../../winix/winixd/core/image.h
./seo.o: ../../../../winix/winixd/core/threadmanager.h
./seo.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -348,7 +314,6 @@
./seo.o: ../../../../winix/winixd/core/ipbancontainer.h
./seo.o: ../../../../winix/winixd/core/sessionidmanager.h
./seo.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./seo.o: ../../../../winix/winixd/core/slog.h
./seo.o: ../../../../winix/winixd/functions/functions.h
./seo.o: ../../../../winix/winixd/functions/functionbase.h
./seo.o: ../../../../winix/winixd/functions/functionparser.h

View File

@@ -8,8 +8,9 @@
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/space/space.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/stream.h
./init.o: ../../../../pikotools/src/utf8/utf8.h
./init.o: ../../../../pikotools/src/date/date.h
./init.o: ../../../../pikotools/src/membuffer/membuffer.h
./init.o: ../../../../pikotools/src/textstream/types.h
@@ -65,25 +66,16 @@
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../pikotools/src/convert/strtoint.h
./init.o: ../../../../pikotools/src/convert/text.h
./init.o: ../../../../pikotools/src/convert/misc.h
./init.o: ../../../../pikotools/src/textstream/types.h
./init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/version.h
./init.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h
./init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
./init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
./init.o: ../../../../ezc/src/outstreams.h
./init.o: ../../../../pikotools/src/convert/misc.h ../../../../ezc/src/ezc.h
./init.o: ../../../../ezc/src/version.h ../../../../ezc/src/generator.h
./init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
./init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/objects.h
./init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h
./init.o: ../../../../ezc/src/patternparser.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/core/config.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/core/misc.h
./init.o: ../../../../winix/winixd/core/winix_const.h
./init.o: ../../../../pikotools/src/convert/convert.h
./init.o: ../../../../pikotools/src/convert/inttostr.h
./init.o: ../../../../pikotools/src/convert/patternreplacer.h
./init.o: ../../../../pikotools/src/convert/double.h
./init.o: ../../../../winix/winixd/models/winixmodel.h
./init.o: ../../../../winix/winixd/core/header.h
./init.o: ../../../../winix/winixd/core/compress.h
@@ -94,21 +86,12 @@
./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./init.o: ../../../../winix/winixd/core/mount.h
./init.o: ../../../../winix/winixd/core/mounts.h
./init.o: ../../../../winix/winixd/db/db.h
./init.o: ../../../../winix/winixd/db/dbbase.h
./init.o: ../../../../winix/winixd/db/dbconn.h
./init.o: ../../../../winix/winixd/db/dbtextstream.h
./init.o: ../../../../winix/winixd/core/textstream.h
./init.o: ../../../../winix/winixd/core/error.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/dircontainer.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/mountparser.h
./init.o: ../../../../winix/winixd/core/jobtask.h
./init.o: ../../../../winix/winixd/core/cur.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/session.h
./init.o: ../../../../winix/winixd/models/user.h
./init.o: ../../../../winix/winixd/core/rebus.h
./init.o: ../../../../winix/winixd/core/ipban.h bot.h stats.h
./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h templates.h
@@ -122,8 +105,9 @@
./stats.o: ../../../../pikotools/src/textstream/stream.h
./stats.o: ../../../../pikotools/src/space/space.h
./stats.o: ../../../../pikotools/src/convert/inttostr.h
./stats.o: ../../../../pikotools/src/utf8/utf8.h
./stats.o: ../../../../pikotools/src/convert/misc.h
./stats.o: ../../../../pikotools/src/textstream/stream.h
./stats.o: ../../../../pikotools/src/utf8/utf8.h
./stats.o: ../../../../pikotools/src/date/date.h
./stats.o: ../../../../pikotools/src/membuffer/membuffer.h
./stats.o: ../../../../pikotools/src/textstream/types.h
@@ -178,6 +162,7 @@
./templates.o: ../../../../morm/src/spacewrapper.h
./templates.o: ../../../../pikotools/src/space/space.h
./templates.o: ../../../../pikotools/src/convert/inttostr.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../morm/src/baseobjectwrapper.h
./templates.o: ../../../../pikotools/src/date/date.h
./templates.o: ../../../../morm/src/modelcontainerwrapper.h
@@ -215,7 +200,6 @@
./templates.o: ../../../../pikotools/src/convert/strtoint.h
./templates.o: ../../../../pikotools/src/convert/text.h
./templates.o: ../../../../pikotools/src/convert/misc.h
./templates.o: ../../../../pikotools/src/textstream/types.h
./templates.o: ../../../../pikotools/src/convert/double.h stats.h
./templates.o: ../../../../winix/winixd/core/config.h
./templates.o: ../../../../pikotools/src/space/spaceparser.h

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2022, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,6 @@
#include "core/log.h"
#include "core/request.h"
#include "core/config.h"
#include "db/db.h"
#include "core/cur.h"
#include "bot.h"

File diff suppressed because it is too large Load Diff

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2022, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -210,13 +210,11 @@ using namespace Thread;
// temporarily
info.plugin->Assign(WINIX_PLUGIN_INIT, PluginInit);
tdb.SetConn(info.db->GetConn());
tdb.LogQueries(info.config->log_db_query);
tdb.set_dependency(info.functions);
// thread_info and fun_show_threads are used in 'ticket' plugins too
thread_info.set_dependency((WinixModelDeprecated*)info.functions);
thread_info.SetDb(info.db);
thread_info.SetTDb(&tdb);
thread_info.SetSystem(info.system);
thread_info.plugin_id = info.plugin_id;

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2021, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -147,7 +147,7 @@ void Reply::MakePost()
cur->request->last_item = &cur->request->item;
cur->request->item.item_content.guest_name.clear();
if( functions->CheckAbuse(&slog) )
if( functions->CheckAbuse() )
{
// temporary: to show values in the html form
// this will be changed when a new ezc objects will be implemented

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2021, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,313 +33,126 @@
*/
#include "tdb.h"
#include "core/log.h"
namespace Winix
namespace Winix::Thread
{
namespace Thread
void TDb::GetAnswers(long file_id, std::vector<ThreadFiles> & answer_id_tab)
{
morm::Finder<ThreadFiles> finder(model_connector);
//Error TDb::AddThread(const Thread & thread)
//{
// query.Clear();
// query << R("insert into plugins.thread (file_id, replies, last_item, closed) values (")
// << thread.file_id
// << thread.replies
// << thread.last_item_id
// << (thread.closed ? 1 : 0 )
// << R(");");
//
//return DoCommand(query);
//}
void TDb::SetThreadColumns(PGresult * r)
{
cfile_id = AssertColumn(r, "file_id");
creplies = AssertColumn(r, "replies");
cclosed = AssertColumn(r, "closed");
// clast_item = AssertColumn(r, "last_item");
// cdate_modification = AssertColumn(r, "date_modification");
// cuser_id = AssertColumn(r, "user_id");
// cguest = AssertColumn(r, "guest_name");
finder.
select().
where().
eq(L"file_id", file_id).
get_vector(answer_id_tab);
}
void TDb::SetThread(PGresult * r, int col, Thread & thread)
bool TDb::AddAnswer(long file_id, long answer_id)
{
thread.file_id = AssertValueLong(r, col, cfile_id);
thread.replies = AssertValueLong(r, col, creplies);
thread.closed = AssertValueBool(r, col, cclosed);
//thread.last_item_id = AssertValueLong(r, col, clast_item);
//thread.last_item_date_modification = AssertValueDate(r, col, cdate_modification);
//thread.last_item_user_id = AssertValueLong(r, col, cuser_id);
//AssertValueWide(r, col, cguest, thread.last_item_guest_name);
}
bool status = false;
ThreadFiles tf;
tf.set_connector(model_connector);
tf.clear();
tf.file_id = file_id;
tf.answer_id = answer_id;
//Error TDb::GetThread(long file_id, Thread & thread)
//{
// PGresult * r = 0;
// Error status = WINIX_ERR_OK;
//
// try
// {
// query.Clear();
// query << R("select thread.file_id, thread.replies, thread.closed, thread.last_item, "
// "item.date_modification, item.user_id, item.guest_name "
// "from plugins.thread left join core.item on thread.last_item = item.id "
// "where thread.file_id = ") << file_id << R(";");
//
// r = AssertQuery(query);
// AssertResult(r, PGRES_TUPLES_OK);
//
// int rows = Rows(r);
//
// if( rows > 1 )
// log << log1 << "ThreadDb: there is more than one thread with file_id: " << file_id << logend;
// else
// if( rows == 0 )
// throw Error(WINIX_ERR_NO_THREAD);
//
// SetThreadColumns(r);
// SetThread(r, 0, thread);
// }
// catch(const Error & e)
// {
// status = e;
// }
//
// ClearResult(r);
//
//return status;
//}
//Error TDb::GetThreads(const std::vector<long> & file_id_tab, std::vector<Thread> & thread_tab)
//{
// PGresult * r = 0;
// Error status = WINIX_ERR_OK;
// thread_tab.clear();
//
// if( file_id_tab.empty() )
// return status;
//
// try
// {
// CreateIdList(file_id_tab, list_id);
//
// // they should be sorted by file_id (they are used in a binary search later)
// query.Clear();
// query << R("select thread.file_id, thread.replies, thread.closed, thread.last_item, "
// "item.date_modification, item.user_id, item.guest_name "
// "from plugins.thread left join core.item on thread.last_item = item.id "
// "where thread.file_id in ") << R(list_id) << R(" order by file_id asc;");
//
// r = AssertQuery(query);
// AssertResult(r, PGRES_TUPLES_OK);
//
// int rows = Rows(r);
// SetThreadColumns(r);
//
// for(int i=0 ; i<rows ; ++i)
// {
// SetThread(r, i, thread_temp);
// thread_tab.push_back(thread_temp);
// }
// }
// catch(const Error & e)
// {
// status = e;
// }
//
// ClearResult(r);
//
//return status;
//}
Error TDb::GetAnswers(long file_id, std::vector<long> & answer_id_tab)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
answer_id_tab.clear();
try
if( tf.insert(false) )
{
query.Clear();
query << R("select answer_id from plugins.thread_files "
"where file_id = ") << file_id << R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
pt::TextStream query;
query << "UPDATE plugins.thread SET (last_item, replies) = ("
<< answer_id
<< ", replies+1) WHERE file_id="
<< file_id
<< ";";
int rows = Rows(r);
answer_id_tab.resize(rows);
for(int i=0 ; i<rows ; ++i)
answer_id_tab[i] = AssertValueLong(r, i, 0);
status = do_query(query);
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
}
Error TDb::AddAnswer(long file_id, long answer_id)
{
query.Clear();
query << R("insert into plugins.thread_files (file_id, answer_id) values (")
<< file_id
<< answer_id
<< R(");");
Error status = DoCommand(query);
if( status != WINIX_ERR_OK )
return status;
query.Clear();
query << R("update plugins.thread set (last_item, replies) = (")
<< answer_id
<< R(", replies+1) where file_id=")
<< file_id
<< R(";");
return DoCommand(query);
return status;
}
long TDb::FindLastAnswer(long file_id)
{
PGresult * r = 0;
//Error status = WINIX_ERR_OK;
morm::Finder<ThreadFiles> finder(model_connector);
long last_item_id = -1;
try
{
query.Clear();
query << R("select id from plugins.thread_files left join core.item on item.id=answer_id where file_id=")
<< file_id
<< R(" order by date_creation desc limit 1;");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
ThreadFiles tf = finder.
select().
raw("LEFT JOIN core.item ON item.id=thread_files.answer_id").
raw("LEFT JOIN core.content ON item.content_id=content.id").
where().
eq(L"file_id", file_id).
raw("ORDER BY content.date_creation DESC").
raw("LIMIT 1;").
get();
if( Rows(r) == 1 )
last_item_id = AssertValueLong(r, 0, 0);
}
catch(const Error & e)
{
//status = e;
}
ClearResult(r);
if( tf.found() )
last_item_id = tf.answer_id;
return last_item_id;
return last_item_id;
}
Error TDb::RemoveAnswer(long answer_id)
bool TDb::RemoveAnswer(long answer_id)
{
PGresult * r1 = 0;
PGresult * r2 = 0;
Error status = WINIX_ERR_OK;
try
bool status = false;
morm::Finder<ThreadFiles> finder(model_connector);
std::vector<ThreadFiles> thread_files;
finder.select().where().eq(L"answer_id", answer_id).get_vector(thread_files);
file_id_tab.resize(thread_files.size());
for(size_t i=0 ; i<thread_files.size() ; ++i)
{
// selecting files which have answer_id as an answer
query.Clear();
query << R("select file_id from plugins.thread_files where answer_id = ")
<< answer_id
<< R(";");
file_id_tab[i] = thread_files[i].file_id;
}
r1 = AssertQuery(query);
AssertResult(r1, PGRES_TUPLES_OK);
int rows = Rows(r1);
file_id_tab.resize(rows);
pt::TextStream query;
query << "DELETE FROM plugins.thread_files WHERE answer_id = " << answer_id << ";";
for(int i=0 ; i<rows ; ++i)
file_id_tab[i] = AssertValueLong(r1, i, 0);
// deleting those answers
query.Clear();
query << R("delete from plugins.thread_files where answer_id = ")
<< answer_id
<< R(";");
r2 = AssertQuery(query);
AssertResult(r2, PGRES_COMMAND_OK);
rows = AffectedRows(r2);
if( rows > 0 )
log << log2 << "ThreadDb: deleted " << rows << " rows from plugins.thread_files" << logend;
// setting new last_items to the files
if( do_query(query) )
{
status = RemoveAnswerRecalcLast(file_id_tab);
}
catch(const Error & e)
{
status = e;
}
ClearResult(r1);
ClearResult(r2);
return status;
return status;
}
Error TDb::RemoveAnswerRecalcLast(long file_id)
bool TDb::RemoveAnswerRecalcLast(long file_id)
{
long last_item_id = FindLastAnswer(file_id);
query.Clear();
query << R("update plugins.thread set (replies, last_item) = (replies-1,")
pt::TextStream query;
query << "UPDATE plugins.thread SET (replies, last_item) = (replies-1,"
<< last_item_id
<< R(") where file_id=")
<< ") WHERE file_id="
<< file_id
<< R(";");
<< ";";
return DoCommand(query);
return do_query(query);
}
Error TDb::RemoveAnswerRecalcLast(const std::vector<long> & file_id_tab)
bool TDb::RemoveAnswerRecalcLast(const std::vector<long> & file_id_tab)
{
for(size_t i=0 ; i<file_id_tab.size() ; ++i)
bool status = true;
for(size_t i=0 ; status && i < file_id_tab.size() ; ++i)
{
long file_id = file_id_tab[i];
Error status = RemoveAnswerRecalcLast(file_id);
if( status != WINIX_ERR_OK )
return status;
status = RemoveAnswerRecalcLast(file_id);
}
return WINIX_ERR_OK;
return status;
}
@@ -348,155 +161,89 @@ Error TDb::RecalcThread(long file_id)
long replies = CalcAnswers(file_id);
long last_item = FindLastAnswer(file_id);
query.Clear();
query << R("update plugins.thread set (replies, last_item) = (")
pt::TextStream query;
query << "UPDATE plugins.thread SET (replies, last_item) = ("
<< replies
<< last_item
<< R(") where file_id=")
<< ") WHERE file_id="
<< file_id
<< R(";");
<< ";";
return DoCommand(query);
return do_query(query);
}
long TDb::CalcAnswers(long file_id)
{
PGresult * r = 0;
morm::Finder<ThreadFiles> finder(model_connector);
long answers = 0;
try
{
query.Clear();
query << R("select count(file_id) from plugins.thread_files where file_id=") << file_id << R(";");
ThreadFiles tf = finder.
select(morm::Select::no_auto_generated_columns).
raw("SELECT COUNT(file_id) as file_id FROM plugins.thread_files").
where().
eq(L"file_id", file_id).
get();
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
if( tf.found() )
answers = tf.file_id;
if( Rows(r) == 1 )
answers = AssertValueLong(r, 0, 0);
}
catch(const Error &)
{
}
ClearResult(r);
return answers;
return answers;
}
Error TDb::RemoveThread(long file_id)
bool TDb::RemoveThread(long file_id)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
try
bool status = false;
pt::TextStream query;
query << "DELETE FROM plugins.thread WHERE file_id=" << file_id;
if( do_query(query) )
{
query.Clear();
query << R("delete from plugins.thread where file_id=") << file_id << R(";");
query.clear();
query << "DELETE FROM plugins.thread_files WHERE file_id=" << file_id;
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
long rows = AffectedRows(r);
if( rows > 0 )
log << log2 << "ThreadDb: deleted " << rows << " rows from plugins.thread" << logend;
ClearResult(r);
query.Clear();
query << R("delete from plugins.thread_files where file_id=") << file_id << R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
rows = AffectedRows(r);
if( rows > 0 )
log << log2 << "ThreadDb: deleted " << rows << " rows from plugins.thread_files" << logend;
status = do_query(query);
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
return status;
}
Error TDb::RemoveAnswerOnly(long answer_id)
bool TDb::RemoveAnswerOnly(long answer_id)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
try
{
query.Clear();
query << R("delete from plugins.thread_files where answer_id=") << answer_id << R(";");
pt::TextStream query;
query << "DELETE FROM plugins.thread_files WHERE answer_id=" << answer_id;
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
long rows = AffectedRows(r);
if( rows > 0 )
log << log2 << "ThreadDb: deleted " << rows << " rows from plugins.thread_files" << logend;
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
return do_query(query);
}
void TDb::GetAllThreadsId(std::vector<long> & file_id)
// this method reads all threads, need to be refactored
void TDb::GetAllThreads(std::vector<Thread> & threads)
{
PGresult * r = 0;
file_id.clear();
try
morm::Finder<Thread> finder(model_connector);
finder.select().get_vector(threads);
}
bool TDb::do_query(pt::TextStream & query)
{
if( model_connector)
{
query.Clear();
query << R("select file_id from plugins.thread;");
morm::DbConnector * db_connector = model_connector->get_db_connector();
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
int rows = Rows(r);
file_id.resize(rows);
for(int i=0 ; i<rows ; ++i)
file_id[i] = AssertValueLong(r, i, 0);
if( db_connector )
{
return db_connector->query(query);
}
}
catch(const Error &)
{
}
ClearResult(r);
return false;
}
} // namespace
} // namespace Winix
}

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2021, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,49 +36,36 @@
#define headerfile_winix_plugins_thread_tdb
#include <vector>
#include "core/winixmodeldeprecated.h"
#include "thread.h"
#include "db/dbbase.h"
#include "threadfiles.h"
#include "core/error.h"
namespace Winix
namespace Winix::Thread
{
namespace Thread
{
class TDb : public DbBase
class TDb : public WinixModelDeprecated
{
public:
/*
high level interface
*/
void GetAnswers(long file_id, std::vector<ThreadFiles> & answer_id_tab);
bool AddAnswer(long file_id, long answer_id);
//Error AddThread(const Thread & thread);
//Error GetThread(long file_id, Thread & thread);
//Error GetThreads(const std::vector<long> & file_id_tab, std::vector<Thread> & thread_tab);
Error RemoveThread(long file_id);
Error AddAnswer(long file_id, long answer_id);
Error GetAnswers(long file_id, std::vector<long> & answer_id_tab);
Error RemoveAnswer(long answer_id);
/*
low level interface
*/
bool RemoveAnswer(long answer_id);
bool RemoveThread(long file_id);
// looking for the last answer in a thread (in 'thread_files' table)
// this is not the value from 'thread' table
long FindLastAnswer(long file_id);
// returning all threads id (file_id) (from 'thread' table)
void GetAllThreadsId(std::vector<long> & file_id);
// returning all threads
// IMPROVEME need to be refactored
void GetAllThreads(std::vector<Thread> & threads);
// removing only the answer in 'thread_files' table without updating 'thread' table
Error RemoveAnswerOnly(long answer_id);
bool RemoveAnswerOnly(long answer_id);
// returning how many answers there are
// calculating from 'thread_files' table
@@ -91,25 +78,20 @@ public:
private:
DbTextStream query;
std::wstring list_id;
int cfile_id, creplies, cclosed;
//int clast_item, cdate_modification, cuser_id, cguest;
Thread thread_temp;
std::vector<long> file_id_tab;
void SetThreadColumns(PGresult * r);
void SetThread(PGresult * r, int col, Thread & thread);
Error RemoveAnswerRecalcLast(long file_id);
Error RemoveAnswerRecalcLast(const std::vector<long> & file_id_tab);
bool do_query(pt::TextStream & query);
bool RemoveAnswerRecalcLast(long file_id);
bool RemoveAnswerRecalcLast(const std::vector<long> & file_id_tab);
};
} // namespace
} // namespace Winix
}
#endif

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2021, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -44,11 +44,6 @@ namespace Winix
namespace Thread
{
void ThreadInfo::SetDb(Db * pdb)
{
db = pdb;
}
void ThreadInfo::SetTDb(TDb * ptdb)
{
@@ -93,18 +88,24 @@ return out_dir_tab.back();
}
Item ThreadInfo::GetItemById(long id)
{
morm::Finder<Item> finder(model_connector);
return finder.select().where().eq(L"id", id).get();
}
void ThreadInfo::RemoveThread(long file_id)
{
if( tdb->GetAnswers(file_id, remove_answer_id_tab) == WINIX_ERR_OK )
tdb->GetAnswers(file_id, remove_answers_tab);
for(size_t i=0 ; i < remove_answers_tab.size() ; ++i)
{
for(size_t i=0 ; i<remove_answer_id_tab.size() ; ++i)
Item item = GetItemById(remove_answers_tab[i].answer_id);
if( item.found() )
{
Item item;
item.set_connector(model_connector);
item.id = remove_answer_id_tab[i];
item.remove(); // CHECKME is it correct to set only 'id' and call 'remove'?
//db->DelFileById(remove_answer_id_tab[i]);
item.remove();
}
}
@@ -112,7 +113,6 @@ void ThreadInfo::RemoveThread(long file_id)
}
void ThreadInfo::RemoveThreadAnswer(long answer_id)
{
tdb->RemoveAnswer(answer_id);
@@ -151,7 +151,9 @@ void ThreadInfo::RepairAnswers(long file_id)
tdb->GetAnswers(file_id, repair_answer_tab);
for(size_t i=0 ; i<repair_answer_tab.size() ; ++i)
RepairAnswer(repair_answer_tab[i]);
RepairAnswer(repair_answer_tab[i].answer_id);
repair_answer_tab.clear();
}
@@ -186,10 +188,12 @@ void ThreadInfo::Repair(long file_id)
void ThreadInfo::Repair()
{
tdb->GetAllThreadsId(repair_id_tab);
tdb->GetAllThreads(repair_threads);
for(size_t i=0 ; i<repair_id_tab.size() ; ++i)
Repair(repair_id_tab[i]);
for(size_t i=0 ; i<repair_threads.size() ; ++i)
Repair(repair_threads[i].file_id);
repair_threads.clear();
}

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2021, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
#include <vector>
#include "core/system.h"
#include "db/db.h"
#include "thread.h"
#include "tdb.h"
#include "core/winixmodeldeprecated.h"
@@ -45,19 +44,15 @@
namespace Winix
namespace Winix::Thread
{
namespace Thread
{
class ThreadInfo : public WinixModelDeprecated
{
public:
void SetDb(Db * pdb);
void SetTDb(TDb * ptdb);
void SetSystem(System * psystem);
@@ -103,12 +98,13 @@ public:
private:
Db * db;
TDb * tdb;
System * system;
std::vector<Item*> out_dir_tab;
std::vector<long> remove_answer_id_tab, repair_id_tab, repair_answer_tab;
std::vector<ThreadFiles> remove_answers_tab;
std::vector<ThreadFiles> repair_answer_tab;
std::vector<Thread> repair_threads;
Item out_item, repair_item;
//DbItemQuery iq;
@@ -116,12 +112,12 @@ private:
void RepairAnswers(long file_id);
void Repair(long file_id);
Item GetItemById(long id);
};
} // namespace
} // namespace Winix
}
#endif

File diff suppressed because it is too large Load Diff

View File

@@ -204,12 +204,9 @@ using namespace Ticket;
info.plugin->Assign(WINIX_END_REQUEST, EndRequest);
info.plugin->Assign(WINIX_PL_TICKET_LOAD_TICKETS, ShowTicketsFromDir);
tdb.set_dependency((WinixModelDeprecated*)info.functions);
tdb.SetConn(info.db->GetConn());
tdb.LogQueries(info.config->log_db_query);
ticket_info.set_dependency((WinixRequest*)info.functions);
ticket_info.SetDb(info.db);
ticket_info.set_dependency((WinixModelDeprecated*)info.functions);
ticket_info.SetTDb(&tdb);
//ticket_info.SetConfig(info.config);
ticket_info.SetSystem(info.system);

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,257 +33,114 @@
*/
#include "tdb.h"
#include "core/log.h"
namespace Winix
{
namespace Ticket
namespace Winix::Ticket
{
bool TDb::IsTicket(long file_id)
{
PGresult * r = 0;
bool is = false;
try
{
query.Clear();
query << R("select count(*) from plugins.ticket "
"where ticket.file_id=") << file_id << R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
morm::Finder<TicketParam> finder(model_connector);
if( Rows(r)==1 && Cols(r)==1 )
is = AssertValueInt(r, 0, 0) != 0;
}
catch(const Error &)
{
}
ClearResult(r);
// it would be better to have a SelectHelper in winix models
// so we could use a 'select count(*)'
TicketParam ticket_param = finder.select().where().eq(L"file_id", file_id).raw("LIMIT 1").get();
return is;
return ticket_param.found();
}
void TDb::SetTicketColumns(PGresult * r)
void TDb::GetTicket(long file_id, Ticket & ticket)
{
cfileid = AssertColumn(r, "file_id");
cparam = AssertColumn(r, "param");
cintv = AssertColumn(r, "intv");
cdecv = AssertColumn(r, "decv");
}
morm::Finder<TicketParam> finder(model_connector);
void TDb::ReadTicketPar(PGresult * r, Ticket::TicketParam & par, int row)
{
par.Clear();
par.param = AssertValueInt(r, row, cparam);
par.intv = AssertValueLong(r, row, cintv);
AssertValueWide(r, row, cdecv, par.decv); // !! temporarily
}
Error TDb::GetTicket(long file_id, Ticket & ticket)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
ticket.Clear();
try
{
// they should be sorted by param (they are used in a binary search later)
query.Clear();
query << R("select file_id, param, intv, decv from plugins.ticket "
"where ticket.file_id=") << file_id << R(" order by param asc;");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
SetTicketColumns(r);
int rows = Rows(r);
ticket.file_id = file_id;
if( rows == 0 )
throw Error(WINIX_ERR_NO_TICKET); // !! do we need this kind or error?
if( ticket.par_tab.capacity() < ticket.par_tab.size() + rows )
ticket.par_tab.reserve(ticket.par_tab.size() + rows);
for(int i=0 ; i<rows ; ++i)
{
ReadTicketPar(r, tic_par, i);
ticket.par_tab.push_back(tic_par);
}
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
ticket.file_id = file_id;
ticket.par_tab = finder.select().where().eq(L"file_id", file_id).get_vector();
}
Error TDb::GetTickets(const std::vector<long> & file_id_tab, std::vector<Ticket> & ticket_tab, bool clear_tab)
void TDb::GetTickets(const std::vector<long> & file_id_tab, std::vector<Ticket> & ticket_tab, bool clear_tab)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
if( clear_tab )
ticket_tab.clear();
if( file_id_tab.empty() )
return status;
try
if( !file_id_tab.empty() )
{
// ticket_tab must be sorted by file_id (they are used in a binary search later)
// and items in a ticket should be sorted by param (they are used in a binary search later too)
query.Clear();
query << R("select file_id, param, intv, decv from plugins.ticket "
"where ticket.file_id in ") << file_id_tab << R(" order by file_id, param;");
morm::Finder<TicketParam> finder(model_connector);
std::vector<TicketParam> tmp;
finder.select().where().in(L"file_id", file_id_tab).raw("ORDER BY file_id, param").get_vector(tmp);
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
SetTicketColumns(r);
int rows = Rows(r);
long last_file_id = -1;
empty_ticket.Clear();
for(int i=0 ; i<rows ; ++i)
for(size_t i=0 ; i < tmp.size() ; ++i)
{
long file_id = AssertValueLong(r, i, cfileid);
if( i==0 || last_file_id != file_id )
if( i==0 || last_file_id != tmp[i].file_id )
{
ticket_tab.push_back(empty_ticket);
ticket_tab.back().file_id = file_id;
last_file_id = file_id;
ticket_tab.back().file_id = tmp[i].file_id;
last_file_id = tmp[i].file_id;
}
ReadTicketPar(r, tic_par, i);
ticket_tab.back().par_tab.push_back(tic_par);
ticket_tab.back().par_tab.push_back(tmp[i]);
}
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
}
Error TDb::AddTicket(const Ticket & ticket)
bool TDb::AddTicket(Ticket & ticket)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
try
bool status = true;
for(TicketParam & ticket_param : ticket.par_tab)
{
for(size_t i=0 ; i<ticket.par_tab.size() ; ++i)
if( !ticket_param.insert() )
status = false;
}
return status;
}
bool TDb::RemoveAddTicket(Ticket & ticket)
{
morm::Transaction transaction(model_connector);
bool ok = true;
ok = ok && RemoveTicket(ticket.file_id);
ok = ok && AddTicket(ticket);
transaction.set_successful(ok);
if( !transaction.finish() )
ok = false;
return ok;
}
bool TDb::RemoveTicket(long file_id)
{
bool status = false;
if( model_connector )
{
morm::DbConnector * db_connector = model_connector->get_db_connector();
if( db_connector )
{
query.Clear();
query << R("insert into plugins.ticket (file_id, param, intv) values (")
<< ticket.file_id
<< ticket.par_tab[i].param
<< ticket.par_tab[i].intv
//<< ticket.par_tab[i].decv
<< R(");");
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
pt::TextStream sql;
sql << "DELETE FROM plugins.ticket WHERE file_id=" << file_id;
status = db_connector->query(sql);
}
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
return status;
}
Error TDb::RemoveAddTicket(const Ticket & ticket)
{
Error status = BeginTrans();
if( status != WINIX_ERR_OK )
return status;
status = RemoveTicket(ticket.file_id);
if( status == WINIX_ERR_OK )
status = AddTicket(ticket);
if( status == WINIX_ERR_OK )
status = CommitTrans();
else
RollbackTrans();
return status;
}
Error TDb::RemoveTicket(long file_id)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
try
{
query.Clear();
query << R("delete from plugins.ticket where file_id=") << file_id << R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
long rows = AffectedRows(r);
if( rows > 0 )
log << log2 << "TicketDb: deleted " << rows << " rows from plugins.ticket" << logend;
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
}
} // namespace
} // namespace Winix

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,49 +37,34 @@
#include <vector>
#include "ticket.h"
#include "db/dbbase.h"
#include "core/error.h"
#include "core/winixmodeldeprecated.h"
namespace Winix
namespace Winix::Ticket
{
namespace Ticket
{
class TDb : public DbBase
class TDb : public WinixModelDeprecated
{
public:
bool IsTicket(long file_id);
Error GetTicket(long file_id, Ticket & ticket);
Error GetTickets(const std::vector<long> & file_id_tab, std::vector<Ticket> & ticket_tab, bool clear_tab = true);
Error AddTicket(const Ticket & ticket);
Error RemoveAddTicket(const Ticket & ticket); // first removing and then adding a ticket
Error RemoveTicket(long file_id);
bool IsTicket(long file_id);
void GetTicket(long file_id, Ticket & ticket);
void GetTickets(const std::vector<long> & file_id_tab, std::vector<Ticket> & ticket_tab, bool clear_tab = true);
bool AddTicket(Ticket & ticket);
bool RemoveAddTicket(Ticket & ticket); // first removing and then adding a ticket
bool RemoveTicket(long file_id);
private:
DbTextStream query;
Ticket empty_ticket;
Ticket::TicketParam tic_par;
int cfileid;
int cparam;
int cintv;
int cdecv;
void SetTicketColumns(PGresult * r);
void ReadTicketPar(PGresult * r, Ticket::TicketParam & par, int row);
};
} // namespace
} // namespace Winix
}
#endif

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2021, Tomasz Sowa
* Copyright (c) 2008-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@ bool is_value; // true if value for such a param was defined
bool is_in_ticket_par; // true if the value is defined in ticket.par_tab
// else the value can be defined in meta (or not at all)
Ticket::TicketParam * ticket_par; // if is_in_ticket_par is true
TicketParam * ticket_par; // if is_in_ticket_par is true
pt::Space * value_meta; // if is_in_ticket_par is false and if there is such a value in meta

View File

@@ -0,0 +1,68 @@
/*
* This file is a part of Winix
* and is distributed under the 2-Clause BSD licence.
* Author: Tomasz Sowa <t.sowa@ttmath.org>
*/
/*
* Copyright (c) 2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "ticket.h"
#include <algorithm>
namespace Winix::Ticket
{
Ticket::Ticket()
{
Clear();
}
void Ticket::Clear()
{
file_id = -1;
par_tab.clear();
}
void Ticket::SortParTab()
{
std::sort(par_tab.begin(), par_tab.end(), [](const TicketParam & par1, const TicketParam & par2) -> bool {
return par1.param < par2.param;
});
}
}

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,73 +36,32 @@
#define headerfile_winix_plugins_ticket_ticket
#include <vector>
#include <string>
#include <algorithm>
#include "ticketparam.h"
namespace Winix
namespace Winix::Ticket
{
namespace Ticket
class Ticket
{
public:
struct Ticket
{
struct TicketParam
{
long param;
long intv;
std::wstring decv; // !! temporarily as a string (in the future there'll be a Dec type from ttmath)
void Clear()
{
param = 0;
intv = 0;
decv.clear();
}
TicketParam()
{
Clear();
}
};
Ticket();
long file_id;
typedef std::vector<TicketParam> ParTab;
ParTab par_tab;
void Clear();
void SortParTab();
Ticket()
{
Clear();
}
void Clear()
{
file_id = -1;
par_tab.clear();
}
struct Sort
{
bool operator()(const TicketParam & par1, const TicketParam & par2)
{
return par1.param < par2.param;
}
};
void SortParTab()
{
std::sort(par_tab.begin(), par_tab.end(), Sort());
}
};
} // namespace
} // namespace Winix
}
#endif

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2021, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,12 +65,6 @@ void TicketInfo::SetTDb(TDb * ptdb)
}
void TicketInfo::SetDb(Db * pdb)
{
db = pdb;
}
//void TicketInfo::SetConfig(Config * pconfig)
//{
// config = pconfig;
@@ -261,7 +255,7 @@ void TicketInfo::FindCurrentConf()
void TicketInfo::CheckMinMaxValue(pt::Space & space, Ticket::TicketParam & par)
void TicketInfo::CheckMinMaxValue(pt::Space & space, TicketParam & par)
{
std::wstring * type = space.get_wstr(L"type");
@@ -352,7 +346,7 @@ pt::Space & TicketInfo::FindAddMetaByParam(pt::Space & meta, long param)
bool TicketInfo::ReadTicketValue(pt::Space & config_param, long param_id, Ticket::TicketParam & par, const std::wstring & value, pt::Space & meta)
bool TicketInfo::ReadTicketValue(pt::Space & config_param, long param_id, TicketParam & par, const std::wstring & value, pt::Space & meta)
{
if( config_param.is_equal(L"type", L"integer") ||
config_param.is_equal(L"type", L"progress") ||
@@ -491,7 +485,8 @@ void TicketInfo::ReadTicketParam(pt::Space & config_param, Ticket & ticket, long
void TicketInfo::ReadTicketParam(Ticket & ticket, long param_id, const std::wstring & value, pt::Space & meta)
{
ticket_param.Clear();
ticket_param.set_connector(model_connector);
ticket_param.clear();
pt::Space::TableType * params = cur_conf->get_table(L"params");
if( params )
@@ -640,7 +635,7 @@ void TicketInfo::RemoveTicket(long file_id)
*
*/
if( tdb->GetTicket(file_id, rm_ticket) == WINIX_ERR_OK )
if( tdb->IsTicket(file_id) )
{
tdb->RemoveTicket(file_id);
}

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2021, Tomasz Sowa
* Copyright (c) 2010-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,6 @@
#include "ticket.h"
#include "core/system.h"
#include "functions/functions.h"
#include "db/db.h"
#include "tdb.h"
#include "space/spaceparser.h"
#include "core/winixmodeldeprecated.h"
@@ -74,7 +73,6 @@ public:
TicketInfo();
void SetTDb(TDb * ptdb);
void SetDb(Db * pdb);
//void SetConfig(Config * pconfig);
void SetSystem(System * psystem);
void SetCur(Cur * pcur);
@@ -139,7 +137,6 @@ public:
private:
Db * db;
TDb * tdb;
//Config * config;
System * system;
@@ -147,7 +144,7 @@ private:
Functions * functions;
// for reading parameters
Ticket::TicketParam ticket_param;
TicketParam ticket_param;
// for adding a new image/file to a ticket
Item file;
@@ -165,9 +162,6 @@ private:
Ticket ticket_empty;
Item item_empty;
// for removing a ticket
Ticket rm_ticket;
bool GetConfContent(const std::wstring & path);
bool ParseTicketConf(long mount_dir_id, const std::wstring & path);
void ReadTicketConf(Mounts & mounts, bool skip_existing_configs);
@@ -177,8 +171,8 @@ private:
pt::Space & FindAddMetaByParam(pt::Space & meta, long param);
void CheckMinMaxValue(pt::Space & space, Ticket::TicketParam & par);
bool ReadTicketValue(pt::Space & space, long param_id, Ticket::TicketParam & par, const std::wstring & value, pt::Space & meta);
void CheckMinMaxValue(pt::Space & space, TicketParam & par);
bool ReadTicketValue(pt::Space & space, long param_id, TicketParam & par, const std::wstring & value, pt::Space & meta);
void ReadTicketValue(pt::Space & space, long param_id, const PostFile & value, pt::Space & meta, Item & upload_dir);
void ReadTicketValue(pt::Space & space, long param_id, const PostFile & value, pt::Space & meta);
void ReadTicketParam(pt::Space & space, Ticket & ticket, long param_id, const std::wstring & value, pt::Space & meta);

View File

@@ -0,0 +1,94 @@
/*
* This file is a part of Winix
* and is distributed under the 2-Clause BSD licence.
* Author: Tomasz Sowa <t.sowa@ttmath.org>
*/
/*
* Copyright (c) 2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "ticketparam.h"
namespace Winix::Ticket
{
void TicketParam::fields()
{
field(L"file_id", file_id);
field(L"param", param);
field(L"intv", intv);
field(L"decv", decv);
}
void TicketParam::after_insert()
{
//get_last_sequence_for_primary_key(L"", );
}
void TicketParam::table()
{
table_name(L"plugins", L"ticket");
}
bool TicketParam::do_migration(int & current_table_version)
{
bool ok = true;
ok = ok && morm::Model::do_migration(current_table_version, 1, this, &TicketParam::do_migration_to_1);
return ok;
}
bool TicketParam::do_migration_to_1()
{
const char * str = R"sql(
CREATE TABLE plugins.ticket (
file_id bigint,
param bigint,
intv bigint,
decv numeric(16,2)
);
)sql";
return db_query(str);
}
}

View File

@@ -0,0 +1,77 @@
/*
* This file is a part of Winix
* and is distributed under the 2-Clause BSD licence.
* Author: Tomasz Sowa <t.sowa@ttmath.org>
*/
/*
* Copyright (c) 2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef headerfile_winix_plugins_ticket_ticketparam
#define headerfile_winix_plugins_ticket_ticketparam
#include <vector>
#include <string>
#include <algorithm>
#include "model.h"
namespace Winix::Ticket
{
class TicketParam : public morm::Model
{
public:
long file_id;
long param;
long intv;
std::wstring decv;
void table();
protected:
void fields();
void after_insert();
bool do_migration(int & current_table_version);
bool do_migration_to_1();
};
}
#endif