From 32e93a04c523f5af865ac6d15f7446def9e4ddc2 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Wed, 24 Feb 2021 01:19:47 +0100 Subject: [PATCH] Item class has been moved to a new directory 'models', a new class has been added: ItemContent and same fields from Item were moved to ItemContent Item - id - parent_id - type (file, dir, symlink) - url - subject - template (html template) - sort_index - content_id ItemContent - id - ref -> references (renamed) - user_id - modification_user_id - group_id - privileges - date_creation - date_modification - guest_name - link_to - link_redirect - file_path - file_fs - file_type - file_size - has_thumb -> file_has_thumb (renamed) - hash -> file_hash (renamed) - hash_type -> file_hash_type (renamed) - content -> content_raw (renamed) - content_type -> content_raw_type (renamed) - content_parsed - content_parsed_type - meta - ameta -> meta_admin (renamed) - modify_index (removed) WIP: #4 --- winixd/Makefile | 5 +- winixd/Makefile.dep | 2 +- winixd/core/Makefile.dep | 566 ++-- winixd/core/Makefile.o.dep | 2 +- winixd/core/app.cpp | 8 + winixd/core/dircontainer.h | 4 +- winixd/core/dirs.cpp | 48 +- winixd/core/dirs.h | 7 +- winixd/core/image.cpp | 50 +- winixd/core/image.h | 5 +- winixd/core/item.h | 156 - winixd/core/misc.h | 3 +- winixd/core/mountparser.h | 5 +- winixd/core/mounts.cpp | 28 +- winixd/core/mounts.h | 2 +- winixd/core/plugin.cpp | 3 + winixd/core/plugin.h | 6 +- winixd/core/request.h | 2 +- winixd/core/session.h | 3 +- winixd/core/system.cpp | 161 +- winixd/core/system.h | 4 +- winixd/core/winixmodel.cpp | 6 + winixd/core/winixmodel.h | 4 +- winixd/db/Makefile.dep | 46 +- winixd/db/db.cpp | 2548 ++++++++--------- winixd/db/db.h | 122 +- winixd/db/dbitemcolumns.cpp | 6 +- winixd/db/dbitemcolumns.h | 8 +- winixd/db/dbitemquery.cpp | 6 +- winixd/db/dbitemquery.h | 7 +- winixd/functions/Makefile.dep | 1858 ++++++------ winixd/functions/cp.cpp | 63 +- winixd/functions/cp.h | 3 +- winixd/functions/default.cpp | 17 +- winixd/functions/download.cpp | 8 +- winixd/functions/emacs.cpp | 4 +- winixd/functions/functionbase.cpp | 8 +- winixd/functions/functionbase.h | 4 +- winixd/functions/functionparser.cpp | 21 +- winixd/functions/functions.cpp | 46 +- winixd/functions/imgcrop.cpp | 24 +- winixd/functions/imgcrop.h | 4 +- winixd/functions/ln.cpp | 18 +- winixd/functions/ls.cpp | 31 +- winixd/functions/meta.cpp | 28 +- winixd/functions/meta.h | 6 +- winixd/functions/mkdir.cpp | 4 +- winixd/functions/mv.cpp | 134 +- winixd/functions/mv.h | 6 +- winixd/functions/privchanger.cpp | 40 +- winixd/functions/pw.cpp | 4 +- winixd/functions/reload.cpp | 4 +- winixd/functions/rm.cpp | 114 +- winixd/functions/rm.h | 6 +- winixd/functions/sort.cpp | 20 +- winixd/functions/sort.h | 4 +- winixd/functions/subject.cpp | 8 +- winixd/functions/template.cpp | 8 +- winixd/functions/upload.cpp | 73 +- winixd/functions/upload.h | 4 +- winixd/main/Makefile.dep | 34 +- winixd/models/Makefile | 24 + winixd/models/Makefile.dep | 66 + winixd/models/Makefile.o.dep | 1 + winixd/models/item.cpp | 231 ++ winixd/models/item.h | 180 ++ .../{core/item.cpp => models/itemcontent.cpp} | 117 +- winixd/models/itemcontent.h | 244 ++ winixd/notify/Makefile.dep | 24 +- winixd/plugins/export/Makefile.dep | 135 +- winixd/plugins/export/exportinfo.cpp | 39 +- winixd/plugins/export/exportinfo.h | 8 +- winixd/plugins/export/funexport.cpp | 35 +- winixd/plugins/export/funexport.h | 4 +- winixd/plugins/export/init.cpp | 14 +- winixd/plugins/gallery/Makefile.dep | 161 +- winixd/plugins/gallery/gallery.cpp | 31 +- winixd/plugins/gallery/gallery.h | 4 +- winixd/plugins/gallery/galleryinfo.h | 4 +- winixd/plugins/gallery/templates.cpp | 12 +- winixd/plugins/group/Makefile.dep | 111 +- winixd/plugins/group/groupinfo.cpp | 4 +- winixd/plugins/group/groupinfo.h | 4 +- winixd/plugins/mailregister/Makefile.dep | 184 +- winixd/plugins/mailregister/init.cpp | 22 +- winixd/plugins/mailregister/templates.cpp | 4 +- winixd/plugins/menu/Makefile.dep | 124 +- winixd/plugins/menu/cache.h | 5 +- winixd/plugins/menu/init.cpp | 10 +- winixd/plugins/menu/templates.cpp | 59 +- winixd/plugins/seo/Makefile.dep | 85 +- winixd/plugins/seo/seo.cpp | 9 +- winixd/plugins/stats/Makefile.dep | 49 +- winixd/plugins/thread/Makefile.dep | 281 +- winixd/plugins/thread/createthread.cpp | 4 +- winixd/plugins/thread/funthread.cpp | 31 +- winixd/plugins/thread/reply.cpp | 6 +- winixd/plugins/thread/showthreads.cpp | 42 +- winixd/plugins/thread/templates.cpp | 56 +- winixd/plugins/thread/threadinfo.cpp | 49 +- winixd/plugins/thread/threadinfo.h | 6 +- winixd/plugins/ticket/Makefile.dep | 171 +- winixd/plugins/ticket/createticket.cpp | 4 +- winixd/plugins/ticket/editticket.cpp | 11 +- winixd/plugins/ticket/showtickets.cpp | 46 +- winixd/plugins/ticket/showtickets.h | 5 +- winixd/plugins/ticket/templates.cpp | 26 +- winixd/plugins/ticket/ticketinfo.cpp | 12 +- winixd/plugins/ticket/ticketinfo.h | 4 +- winixd/templates/Makefile.dep | 823 +++--- winixd/templates/dir.cpp | 60 +- winixd/templates/insert.cpp | 6 +- winixd/templates/item.cpp | 176 +- winixd/templates/patterncacher.cpp | 4 +- winixd/templates/patterncacher.h | 5 +- winixd/templates/priv.cpp | 28 +- winixd/templates/stat.cpp | 18 +- winixd/templates/templates.h | 2 +- 118 files changed, 5795 insertions(+), 4514 deletions(-) delete mode 100644 winixd/core/item.h create mode 100644 winixd/models/Makefile create mode 100644 winixd/models/Makefile.dep create mode 100644 winixd/models/Makefile.o.dep create mode 100644 winixd/models/item.cpp create mode 100644 winixd/models/item.h rename winixd/{core/item.cpp => models/itemcontent.cpp} (50%) create mode 100644 winixd/models/itemcontent.h diff --git a/winixd/Makefile b/winixd/Makefile index a362318..7b2b568 100644 --- a/winixd/Makefile +++ b/winixd/Makefile @@ -61,6 +61,7 @@ all: winix.so plugins winix winix.so: $(winix.src.files) @cd core ; $(MAKE) -e + @cd models ; $(MAKE) -e @cd db ; $(MAKE) -e @cd functions ; $(MAKE) -e @cd notify ; $(MAKE) -e @@ -69,7 +70,7 @@ winix.so: $(winix.src.files) @cd $(GLOBAL_WORKING_DIR)/tito/src ; $(MAKE) -e @cd $(GLOBAL_WORKING_DIR)/pikotools ; $(MAKE) -e @cd $(GLOBAL_WORKING_DIR)/morm/src ; $(MAKE) -e - $(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/convert/convert.a $(GLOBAL_WORKING_DIR)/pikotools/utf8/utf8.a $(GLOBAL_WORKING_DIR)/pikotools/space/space.a $(GLOBAL_WORKING_DIR)/pikotools/mainparser/mainparser.a $(GLOBAL_WORKING_DIR)/pikotools/date/date.a $(GLOBAL_WORKING_DIR)/pikotools/log/log.a $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive + $(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o models/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/convert/convert.a $(GLOBAL_WORKING_DIR)/pikotools/utf8/utf8.a $(GLOBAL_WORKING_DIR)/pikotools/space/space.a $(GLOBAL_WORKING_DIR)/pikotools/mainparser/mainparser.a $(GLOBAL_WORKING_DIR)/pikotools/date/date.a $(GLOBAL_WORKING_DIR)/pikotools/log/log.a $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive winix: winix.so $(winix.src.files) @@ -96,6 +97,7 @@ FORCE: clean: @cd core ; $(MAKE) -e clean @cd db ; $(MAKE) -e clean + @cd models ; $(MAKE) -e clean @cd functions ; $(MAKE) -e clean @cd templates ; $(MAKE) -e clean @cd notify ; $(MAKE) -e clean @@ -123,6 +125,7 @@ clean: depend: @cd core ; $(MAKE) -e depend @cd db ; $(MAKE) -e depend + @cd models ; $(MAKE) -e depend @cd functions ; $(MAKE) -e depend @cd templates ; $(MAKE) -e depend @cd notify ; $(MAKE) -e depend diff --git a/winixd/Makefile.dep b/winixd/Makefile.dep index 54ff748..e3a1cfb 100644 --- a/winixd/Makefile.dep +++ b/winixd/Makefile.dep @@ -1 +1 @@ -winix.src.files = ./core/synchro.h ./core/sessioncontainer.h ./core/cookieparser.h ./core/misc.cpp ./core/item.cpp ./core/error.h ./core/timezone.h ./core/compress.h ./core/crypt.cpp ./core/dirs.cpp ./core/slog.cpp ./core/config.cpp ./core/lastcontainer.cpp ./core/users.h ./core/httpsimpleparser.cpp ./core/threadmanager.h ./core/postparser.h ./core/pluginmsg.h ./core/acceptbaseparser.h ./core/loadavg.cpp ./core/job.h ./core/mountparser.cpp ./core/timezones.h ./core/sessionmanager.h ./core/groups.h ./core/system.cpp ./core/rebus.h ./core/synchro.cpp ./core/lock.cpp ./core/acceptencodingparser.h ./core/version.h ./core/compress.cpp ./core/ipbancontainer.cpp ./core/request.h ./core/plugindata.h ./core/plugin.cpp ./core/sessionparser.cpp ./core/bbcodeparser.h ./core/users.cpp ./core/mount.cpp ./core/item.h ./core/slog.h ./core/threadmanager.cpp ./core/acceptbaseparser.cpp ./core/lastcontainer.h ./core/httpsimpleparser.h ./core/timezones.cpp ./core/groups.cpp ./core/requesttypes.h ./core/system.h ./core/bbcodeparser.cpp ./core/lock.h ./core/ipbancontainer.h ./core/group.h ./core/plugin.h ./core/run.cpp ./core/textstream.h ./core/sessionparser.h ./core/basethread.h ./core/mount.h ./core/htmlfilter.cpp ./core/user.cpp ./core/app.cpp ./core/image.cpp ./core/ugcontainer.h ./core/postmultiparser.h ./core/logmanipulators.h ./core/sessioncontainer.cpp ./core/dircontainer.h ./core/log.h ./core/session.h ./core/timezone.cpp ./core/mounts.h ./core/ipban.h ./core/cur.h ./core/misc.h ./core/dirs.h ./core/crypt.h ./core/run.h ./core/config.h ./core/job.cpp ./core/postmultiparser.cpp ./core/sessionmanager.cpp ./core/htmlfilter.h ./core/rebus.cpp ./core/dircontainer.cpp ./core/log.cpp ./core/user.h ./core/loadavg.h ./core/session.cpp ./core/mountparser.h ./core/mounts.cpp ./core/image.h ./core/plugindata.cpp ./core/request.cpp ./core/basethread.cpp ./core/sessionidmanager.h ./core/winix_const.h ./core/sessionidmanager.cpp ./core/winixbase.cpp ./core/winixbase.h ./core/winixmodel.cpp ./core/winixmodel.h ./core/winixrequest.cpp ./core/winixrequest.h ./core/winixsystem.cpp ./core/winixsystem.h ./core/filelog.cpp ./core/filelog.h ./core/app.h ./db/dbconn.cpp ./db/db.cpp ./db/dbbase.h ./db/dbitemcolumns.cpp ./db/dbtextstream.cpp ./db/dbconn.h ./db/db.h ./db/dbitemcolumns.h ./db/dbitemquery.cpp ./db/dbtextstream.h ./db/dbitemquery.h ./db/dbbase.cpp ./functions/upload.cpp ./functions/priv.h ./functions/env.cpp ./functions/default.h ./functions/node.h ./functions/specialdefault.h ./functions/timezone.cpp ./functions/pw.h ./functions/adduser.h ./functions/chmod.h ./functions/imgcrop.cpp ./functions/vim.h ./functions/account.h ./functions/mount.cpp ./functions/uptime.cpp ./functions/ckeditor.cpp ./functions/mkdir.cpp ./functions/reload.cpp ./functions/functionparser.h ./functions/logout.cpp ./functions/rmuser.cpp ./functions/rm.cpp ./functions/chown.h ./functions/nicedit.h ./functions/mv.h ./functions/node.cpp ./functions/specialdefault.cpp ./functions/adduser.cpp ./functions/upload.h ./functions/vim.cpp ./functions/env.h ./functions/timezone.h ./functions/who.h ./functions/cp.cpp ./functions/run.cpp ./functions/locale.h ./functions/imgcrop.h ./functions/passwd.h ./functions/mount.h ./functions/privchanger.cpp ./functions/functions.cpp ./functions/last.h ./functions/ckeditor.h ./functions/mkdir.h ./functions/reload.h ./functions/cat.h ./functions/download.h ./functions/ln.h ./functions/nicedit.cpp ./functions/functionbase.cpp ./functions/man.h ./functions/rm.h ./functions/meta.cpp ./functions/emacs.cpp ./functions/sort.h ./functions/who.cpp ./functions/ipban.h ./functions/locale.cpp ./functions/passwd.cpp ./functions/last.cpp ./functions/subject.h ./functions/download.cpp ./functions/cp.h ./functions/cat.cpp ./functions/login.cpp ./functions/tinymce.cpp ./functions/ln.cpp ./functions/run.h ./functions/uname.h ./functions/man.cpp ./functions/functions.h ./functions/privchanger.h ./functions/ls.cpp ./functions/template.h ./functions/stat.h ./functions/priv.cpp ./functions/default.cpp ./functions/functionbase.h ./functions/pw.cpp ./functions/sort.cpp ./functions/ipban.cpp ./functions/chmod.cpp ./functions/meta.h ./functions/account.cpp ./functions/emacs.h ./functions/subject.cpp ./functions/functionparser.cpp ./functions/uname.cpp ./functions/uptime.h ./functions/template.cpp ./functions/stat.cpp ./functions/tinymce.h ./functions/login.h ./functions/chown.cpp ./functions/logout.h ./functions/mv.cpp ./functions/rmuser.h ./functions/ls.h ./main/main.cpp ./notify/notifypool.h ./notify/templatesnotify.cpp ./notify/notify.cpp ./notify/templatesnotify.h ./notify/notify.h ./notify/notifythread.cpp ./notify/notifypool.cpp ./notify/notifythread.h ./plugins/group/init.cpp ./plugins/group/groups.h ./plugins/group/groupinfo.cpp ./plugins/group/groupinfo.h ./plugins/group/templates.cpp ./plugins/group/groups.cpp ./plugins/stats/statssession.h ./plugins/stats/bot.h ./plugins/stats/stats.cpp ./plugins/stats/templates.cpp ./plugins/stats/init.cpp ./plugins/stats/stats.h ./plugins/stats/templates.h ./plugins/stats/bot.cpp ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/templates.cpp ./plugins/gallery/gallery.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/gallery/gallery.h ./plugins/export/init.cpp ./plugins/export/export.h ./plugins/export/exportthread.cpp ./plugins/export/message.h ./plugins/export/edb.cpp ./plugins/export/funexport.cpp ./plugins/export/exportinfo.cpp ./plugins/export/exportthread.h ./plugins/export/edb.h ./plugins/export/funexport.h ./plugins/export/exportinfo.h ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/ticketinfo.h ./plugins/ticket/showtickets.cpp ./plugins/ticket/createticket.cpp ./plugins/ticket/tdb.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/createticket.h ./plugins/ticket/showtickets.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/tdb.h ./plugins/ticket/sessiondata.h ./plugins/ticket/ticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/funticket.cpp ./plugins/ticket/templates.cpp ./plugins/ticket/editticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/menu/cache.cpp ./plugins/menu/init.cpp ./plugins/menu/cache.h ./plugins/menu/templates.cpp ./plugins/thread/funthread.cpp ./plugins/thread/threadinfo.cpp ./plugins/thread/funthread.h ./plugins/thread/threadinfo.h ./plugins/thread/createthread.cpp ./plugins/thread/reply.cpp ./plugins/thread/showthreads.cpp ./plugins/thread/templates.cpp ./plugins/thread/createthread.h ./plugins/thread/reply.h ./plugins/thread/showthreads.h ./plugins/thread/init.cpp ./plugins/thread/templates.h ./plugins/thread/tdb.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/thread.h ./plugins/thread/tdb.h ./plugins/mailregister/funregistermail.h ./plugins/mailregister/mdb.h ./plugins/mailregister/funregistermail.cpp ./plugins/mailregister/mdb.cpp ./plugins/mailregister/init.cpp ./plugins/mailregister/templates.cpp ./plugins/mailregister/registermail_info.h ./plugins/mailregister/funregistermail_showusers.h ./plugins/mailregister/funregistermail_showusers.cpp ./plugins/mailregister/registermail_info.cpp ./plugins/seo/seo.h ./plugins/seo/seo.cpp ./plugins/seo/init.cpp ./templates/who.cpp ./templates/item.cpp ./templates/mount.cpp ./templates/templates.h ./templates/locale.h ./templates/slog.cpp ./templates/doc.cpp ./templates/localefilter.cpp ./templates/config.cpp ./templates/patterns.h ./templates/miscspace.cpp ./templates/filters.cpp ./templates/login.cpp ./templates/man.cpp ./templates/changepatterns.h ./templates/stat.cpp ./templates/template.cpp ./templates/dir.cpp ./templates/user.cpp ./templates/rebus.cpp ./templates/patterncacher.cpp ./templates/upload.cpp ./templates/textextstream.h ./templates/adduser.cpp ./templates/ipban.cpp ./templates/htmltextstream.h ./templates/indexpatterns.h ./templates/templates.cpp ./templates/winix.cpp ./templates/locale.cpp ./templates/misc.h ./templates/patterns.cpp ./templates/passwd.cpp ./templates/last.cpp ./templates/uptime.cpp ./templates/insert.cpp ./templates/changepatterns.cpp ./templates/localefilter.h ./templates/miscspace.h ./templates/ls.cpp ./templates/sys.cpp ./templates/priv.cpp ./templates/textextstream.cpp ./templates/htmltextstream.cpp ./templates/env.cpp ./templates/indexpatterns.cpp ./templates/patterncacher.h ./templates/misc.cpp ./templates/generic.cpp ./templates/currentdate.cpp ./templates/server.cpp ./templates/antispam.cpp ../../ezc/src/blocks.cpp ../../ezc/src/blocks.h ../../ezc/src/cache.cpp ../../ezc/src/cache.h ../../ezc/src/ezc.h ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../../ezc/src/generator.h ../../ezc/src/item.cpp ../../ezc/src/item.h ../../ezc/src/objects.h ../../ezc/src/outstreams.h ../../ezc/src/pattern.cpp ../../ezc/src/pattern.h ../../ezc/src/patternparser.cpp ../../ezc/src/patternparser.h ../../ezc/src/expressionparser.h ../../tito/src/crypto.cpp ../../tito/src/misc.h ../../tito/src/base64.cpp ../../tito/src/crypto.h ../../tito/src/aes.cpp ../../tito/src/base64.h ../../tito/src/misc.cpp ../../tito/src/aes.h ../../tito/src/base32.cpp ../../tito/src/base32.h ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h ../../pikotools/convert/text.h ../../pikotools/convert/text.cpp ../../pikotools/convert/strtoint.h ../../pikotools/convert/misc.h ../../pikotools/convert/misc.cpp ../../pikotools/convert/patternreplacer.h ../../pikotools/date/date.cpp ../../pikotools/date/date.h ../../pikotools/mainparser/sample/sample.cpp ../../pikotools/mainparser/mainparser.cpp ../../pikotools/mainparser/mainparser.h ../../pikotools/mainspaceparser/mainspaceparser.cpp ../../pikotools/mainspaceparser/mainspaceparser.h ../../pikotools/membuffer/membuffer.h ../../pikotools/space/jsontospaceparser.cpp ../../pikotools/space/jsontospaceparser.h ../../pikotools/space/space.cpp ../../pikotools/space/space.h ../../pikotools/space/spaceparser.cpp ../../pikotools/space/spaceparser.h ../../pikotools/space/spacetojson.cpp ../../pikotools/space/spacetojson.h ../../pikotools/textstream/textstream.h ../../pikotools/textstream/types.h ../../pikotools/utf8/utf8.cpp ../../pikotools/utf8/utf8.h ../../pikotools/log/filelog.cpp ../../pikotools/log/log.cpp ../../pikotools/log/log.h ../../pikotools/log/filelog.h ../../morm/src/cursorhelper.h ../../morm/src/fieldvaluehelper.h ../../morm/src/finderhelper.h ../../morm/src/modelenv.h ../../morm/src/finder.h ../../morm/src/model.cpp ../../morm/src/model.h ../../morm/src/modelconnector.cpp ../../morm/src/modelconnector.h ../../morm/src/morm.h ../../morm/src/morm_types.h ../../morm/src/outstream.h ../../morm/src/flatconnector.h ../../morm/src/cursor.h ../../morm/src/flatconnector.cpp ../../morm/src/dbconnector.cpp ../../morm/src/jsonconnector.h ../../morm/src/jsonconnector.cpp ../../morm/src/dbconnector.h ../../morm/src/postgresqlconnector.h ../../morm/src/postgresqlconnector.cpp ../../morm/src/baseexpression.cpp ../../morm/src/baseexpression.h ../../morm/src/flatexpression.cpp ../../morm/src/postgresqlexpression.h ../../morm/src/dbexpression.h ../../morm/src/dbexpression.cpp ../../morm/src/flatexpression.h ../../morm/src/postgresqlexpression.cpp ../../morm/src/modeldata.h ../../morm/src/clearer.cpp ../../morm/src/jsonexpression.h ../../morm/src/jsonexpression.cpp ../../morm/src/queryresult.h ../../morm/src/clearer.h ../../morm/src/postgresqlqueryresult.cpp ../../morm/src/postgresqlqueryresult.h ../../morm/src/queryresult.cpp \ No newline at end of file +winix.src.files = ./core/acceptbaseparser.cpp ./core/acceptbaseparser.h ./core/acceptencodingparser.h ./core/app.cpp ./core/app.h ./core/basethread.cpp ./core/basethread.h ./core/bbcodeparser.cpp ./core/bbcodeparser.h ./core/compress.cpp ./core/compress.h ./core/config.cpp ./core/config.h ./core/cookieparser.h ./core/crypt.cpp ./core/crypt.h ./core/cur.h ./core/dircontainer.cpp ./core/dircontainer.h ./core/dirs.cpp ./core/dirs.h ./core/error.h ./core/filelog.cpp ./core/filelog.h ./core/group.h ./core/groups.cpp ./core/groups.h ./core/htmlfilter.cpp ./core/htmlfilter.h ./core/httpsimpleparser.cpp ./core/httpsimpleparser.h ./core/image.cpp ./core/image.h ./core/ipban.h ./core/ipbancontainer.cpp ./core/ipbancontainer.h ./core/job.cpp ./core/job.h ./core/lastcontainer.cpp ./core/lastcontainer.h ./core/loadavg.cpp ./core/loadavg.h ./core/lock.cpp ./core/lock.h ./core/log.cpp ./core/log.h ./core/logmanipulators.h ./core/misc.cpp ./core/misc.h ./core/mount.cpp ./core/mount.h ./core/mountparser.cpp ./core/mountparser.h ./core/mounts.cpp ./core/mounts.h ./core/plugin.cpp ./core/plugin.h ./core/plugindata.cpp ./core/plugindata.h ./core/pluginmsg.h ./core/postmultiparser.cpp ./core/postmultiparser.h ./core/postparser.h ./core/rebus.cpp ./core/rebus.h ./core/request.cpp ./core/request.h ./core/requesttypes.h ./core/run.cpp ./core/run.h ./core/session.cpp ./core/session.h ./core/sessioncontainer.cpp ./core/sessioncontainer.h ./core/sessionidmanager.cpp ./core/sessionidmanager.h ./core/sessionmanager.cpp ./core/sessionmanager.h ./core/sessionparser.cpp ./core/sessionparser.h ./core/slog.cpp ./core/slog.h ./core/synchro.cpp ./core/synchro.h ./core/system.cpp ./core/system.h ./core/user.h ./core/textstream.h ./core/threadmanager.cpp ./core/threadmanager.h ./core/timezone.cpp ./core/timezone.h ./core/timezones.cpp ./core/timezones.h ./core/ugcontainer.h ./core/user.cpp ./core/users.cpp ./core/users.h ./core/version.h ./core/winix_const.h ./core/winixbase.cpp ./core/winixbase.h ./core/winixmodel.cpp ./core/winixmodel.h ./core/winixrequest.cpp ./core/winixrequest.h ./core/winixsystem.cpp ./core/winixsystem.h ./db/db.cpp ./db/db.h ./db/dbbase.cpp ./db/dbbase.h ./db/dbconn.cpp ./db/dbconn.h ./db/dbitemcolumns.cpp ./db/dbitemcolumns.h ./db/dbitemquery.cpp ./db/dbitemquery.h ./db/dbtextstream.cpp ./db/dbtextstream.h ./functions/account.cpp ./functions/account.h ./functions/adduser.cpp ./functions/adduser.h ./functions/cat.cpp ./functions/cat.h ./functions/chmod.cpp ./functions/chmod.h ./functions/chown.cpp ./functions/chown.h ./functions/ckeditor.cpp ./functions/ckeditor.h ./functions/cp.cpp ./functions/cp.h ./functions/default.cpp ./functions/default.h ./functions/download.cpp ./functions/download.h ./functions/emacs.cpp ./functions/emacs.h ./functions/env.cpp ./functions/env.h ./functions/functionbase.cpp ./functions/functionbase.h ./functions/functionparser.cpp ./functions/functionparser.h ./functions/functions.cpp ./functions/functions.h ./functions/imgcrop.cpp ./functions/imgcrop.h ./functions/ipban.cpp ./functions/ipban.h ./functions/last.cpp ./functions/last.h ./functions/ln.cpp ./functions/ln.h ./functions/locale.cpp ./functions/locale.h ./functions/login.cpp ./functions/login.h ./functions/logout.cpp ./functions/logout.h ./functions/ls.cpp ./functions/ls.h ./functions/man.cpp ./functions/man.h ./functions/meta.cpp ./functions/meta.h ./functions/mkdir.cpp ./functions/mkdir.h ./functions/mount.cpp ./functions/mount.h ./functions/mv.cpp ./functions/mv.h ./functions/nicedit.cpp ./functions/nicedit.h ./functions/node.cpp ./functions/node.h ./functions/passwd.cpp ./functions/passwd.h ./functions/priv.cpp ./functions/priv.h ./functions/privchanger.cpp ./functions/privchanger.h ./functions/pw.cpp ./functions/pw.h ./functions/reload.cpp ./functions/reload.h ./functions/rm.cpp ./functions/rm.h ./functions/rmuser.cpp ./functions/rmuser.h ./functions/run.cpp ./functions/run.h ./functions/sort.cpp ./functions/sort.h ./functions/specialdefault.cpp ./functions/specialdefault.h ./functions/stat.cpp ./functions/stat.h ./functions/subject.cpp ./functions/subject.h ./functions/template.cpp ./functions/template.h ./functions/timezone.cpp ./functions/timezone.h ./functions/tinymce.cpp ./functions/tinymce.h ./functions/uname.cpp ./functions/uname.h ./functions/upload.cpp ./functions/upload.h ./functions/uptime.cpp ./functions/uptime.h ./functions/vim.cpp ./functions/vim.h ./functions/who.cpp ./functions/who.h ./main/main.cpp ./notify/notify.cpp ./notify/notify.h ./notify/notifypool.cpp ./notify/notifypool.h ./notify/notifythread.cpp ./notify/notifythread.h ./notify/templatesnotify.cpp ./notify/templatesnotify.h ./plugins/export/edb.cpp ./plugins/export/edb.h ./plugins/export/export.h ./plugins/export/exportinfo.cpp ./plugins/export/exportinfo.h ./plugins/export/exportthread.cpp ./plugins/export/exportthread.h ./plugins/export/funexport.cpp ./plugins/export/funexport.h ./plugins/export/init.cpp ./plugins/export/message.h ./plugins/gallery/gallery.cpp ./plugins/gallery/gallery.h ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/gallery/templates.cpp ./plugins/group/groupinfo.cpp ./plugins/group/groupinfo.h ./plugins/group/groups.cpp ./plugins/group/groups.h ./plugins/group/init.cpp ./plugins/group/templates.cpp ./plugins/mailregister/funregistermail.cpp ./plugins/mailregister/funregistermail.h ./plugins/mailregister/funregistermail_showusers.cpp ./plugins/mailregister/funregistermail_showusers.h ./plugins/mailregister/init.cpp ./plugins/mailregister/mdb.cpp ./plugins/mailregister/mdb.h ./plugins/mailregister/registermail_info.cpp ./plugins/mailregister/registermail_info.h ./plugins/mailregister/templates.cpp ./plugins/menu/cache.cpp ./plugins/menu/cache.h ./plugins/menu/init.cpp ./plugins/menu/templates.cpp ./plugins/seo/init.cpp ./plugins/seo/seo.cpp ./plugins/seo/seo.h ./plugins/stats/bot.cpp ./plugins/stats/bot.h ./plugins/stats/init.cpp ./plugins/stats/stats.cpp ./plugins/stats/stats.h ./plugins/stats/statssession.h ./plugins/stats/templates.cpp ./plugins/stats/templates.h ./plugins/thread/createthread.cpp ./plugins/thread/createthread.h ./plugins/thread/funthread.cpp ./plugins/thread/funthread.h ./plugins/thread/init.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/reply.cpp ./plugins/thread/reply.h ./plugins/thread/showthreads.cpp ./plugins/thread/showthreads.h ./plugins/thread/tdb.cpp ./plugins/thread/tdb.h ./plugins/thread/templates.cpp ./plugins/thread/templates.h ./plugins/thread/thread.h ./plugins/thread/threadinfo.cpp ./plugins/thread/threadinfo.h ./plugins/ticket/createticket.cpp ./plugins/ticket/createticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/editticket.h ./plugins/ticket/funticket.cpp ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/sessiondata.h ./plugins/ticket/showtickets.cpp ./plugins/ticket/showtickets.h ./plugins/ticket/tdb.cpp ./plugins/ticket/tdb.h ./plugins/ticket/templates.cpp ./plugins/ticket/ticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/ticket/ticketinfo.h ./templates/adduser.cpp ./templates/antispam.cpp ./templates/changepatterns.cpp ./templates/changepatterns.h ./templates/config.cpp ./templates/currentdate.cpp ./templates/dir.cpp ./templates/doc.cpp ./templates/env.cpp ./templates/filters.cpp ./templates/generic.cpp ./templates/htmltextstream.cpp ./templates/htmltextstream.h ./templates/indexpatterns.cpp ./templates/indexpatterns.h ./templates/insert.cpp ./templates/ipban.cpp ./templates/item.cpp ./templates/last.cpp ./templates/locale.cpp ./templates/locale.h ./templates/localefilter.cpp ./templates/localefilter.h ./templates/login.cpp ./templates/ls.cpp ./templates/man.cpp ./templates/misc.cpp ./templates/misc.h ./templates/miscspace.cpp ./templates/miscspace.h ./templates/mount.cpp ./templates/passwd.cpp ./templates/patterncacher.cpp ./templates/patterncacher.h ./templates/patterns.cpp ./templates/patterns.h ./templates/priv.cpp ./templates/rebus.cpp ./templates/server.cpp ./templates/slog.cpp ./templates/stat.cpp ./templates/sys.cpp ./templates/template.cpp ./templates/templates.cpp ./templates/templates.h ./templates/textextstream.cpp ./templates/textextstream.h ./templates/upload.cpp ./templates/uptime.cpp ./templates/user.cpp ./templates/who.cpp ./templates/winix.cpp ./models/item.h ./models/item.cpp ./models/itemcontent.cpp ./models/itemcontent.h ../../ezc/src/blocks.cpp ../../ezc/src/blocks.h ../../ezc/src/cache.cpp ../../ezc/src/cache.h ../../ezc/src/expressionparser.h ../../ezc/src/ezc.h ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../../ezc/src/generator.h ../../ezc/src/item.cpp ../../ezc/src/item.h ../../ezc/src/objects.h ../../ezc/src/outstreams.h ../../ezc/src/pattern.cpp ../../ezc/src/pattern.h ../../ezc/src/patternparser.cpp ../../ezc/src/patternparser.h ../../tito/src/aes.cpp ../../tito/src/aes.h ../../tito/src/base32.cpp ../../tito/src/base32.h ../../tito/src/base64.cpp ../../tito/src/base64.h ../../tito/src/crypto.cpp ../../tito/src/crypto.h ../../tito/src/misc.cpp ../../tito/src/misc.h ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h ../../pikotools/convert/misc.cpp ../../pikotools/convert/misc.h ../../pikotools/convert/patternreplacer.h ../../pikotools/convert/strtoint.h ../../pikotools/convert/text.cpp ../../pikotools/convert/text.h ../../pikotools/date/date.cpp ../../pikotools/date/date.h ../../pikotools/log/filelog.cpp ../../pikotools/log/filelog.h ../../pikotools/log/log.cpp ../../pikotools/log/log.h ../../pikotools/mainparser/mainparser.cpp ../../pikotools/mainparser/mainparser.h ../../pikotools/mainparser/sample/sample.cpp ../../pikotools/mainspaceparser/mainspaceparser.cpp ../../pikotools/mainspaceparser/mainspaceparser.h ../../pikotools/membuffer/membuffer.h ../../pikotools/space/jsontospaceparser.cpp ../../pikotools/space/jsontospaceparser.h ../../pikotools/space/space.cpp ../../pikotools/space/space.h ../../pikotools/space/spaceparser.cpp ../../pikotools/space/spaceparser.h ../../pikotools/space/spacetojson.cpp ../../pikotools/space/spacetojson.h ../../pikotools/textstream/textstream.h ../../pikotools/textstream/types.h ../../pikotools/utf8/utf8.cpp ../../pikotools/utf8/utf8.h ../../morm/src/baseexpression.cpp ../../morm/src/baseexpression.h ../../morm/src/clearer.cpp ../../morm/src/clearer.h ../../morm/src/cursor.h ../../morm/src/cursorhelper.h ../../morm/src/dbconnector.cpp ../../morm/src/dbconnector.h ../../morm/src/dbexpression.cpp ../../morm/src/dbexpression.h ../../morm/src/fieldvaluehelper.h ../../morm/src/finder.h ../../morm/src/finderhelper.h ../../morm/src/flatconnector.cpp ../../morm/src/flatconnector.h ../../morm/src/flatexpression.cpp ../../morm/src/flatexpression.h ../../morm/src/jsonconnector.cpp ../../morm/src/jsonconnector.h ../../morm/src/jsonexpression.cpp ../../morm/src/jsonexpression.h ../../morm/src/model.cpp ../../morm/src/model.h ../../morm/src/modelconnector.cpp ../../morm/src/modelconnector.h ../../morm/src/modeldata.h ../../morm/src/modelenv.h ../../morm/src/morm.h ../../morm/src/morm_types.h ../../morm/src/outstream.h ../../morm/src/postgresqlconnector.cpp ../../morm/src/postgresqlconnector.h ../../morm/src/postgresqlexpression.cpp ../../morm/src/postgresqlexpression.h ../../morm/src/postgresqlqueryresult.cpp ../../morm/src/postgresqlqueryresult.h ../../morm/src/queryresult.cpp ../../morm/src/queryresult.h \ No newline at end of file diff --git a/winixd/core/Makefile.dep b/winixd/core/Makefile.dep index a5ef5bb..f9d80de 100644 --- a/winixd/core/Makefile.dep +++ b/winixd/core/Makefile.dep @@ -15,17 +15,16 @@ acceptbaseparser.o: ../../../pikotools/textstream/types.h filelog.h acceptbaseparser.o: ../../../winix/winixd/core/synchro.h acceptbaseparser.o: ../../../winix/winixd/core/log.h acceptbaseparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -acceptbaseparser.o: misc.h item.h requesttypes.h -acceptbaseparser.o: ../../../pikotools/utf8/utf8.h winix_const.h -acceptbaseparser.o: ../../../pikotools/convert/convert.h +acceptbaseparser.o: misc.h requesttypes.h ../../../pikotools/utf8/utf8.h +acceptbaseparser.o: winix_const.h ../../../pikotools/convert/convert.h acceptbaseparser.o: ../../../pikotools/convert/inttostr.h acceptbaseparser.o: ../../../pikotools/convert/patternreplacer.h acceptbaseparser.o: ../../../pikotools/convert/strtoint.h acceptbaseparser.o: ../../../pikotools/convert/text.h -app.o: app.h sessionmanager.h sessioncontainer.h session.h item.h +app.o: app.h sessionmanager.h sessioncontainer.h session.h error.h user.h app.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -app.o: ../../../pikotools/convert/inttostr.h error.h user.h plugindata.h -app.o: rebus.h winixbase.h ../../../winix/winixd/core/config.h +app.o: ../../../pikotools/convert/inttostr.h plugindata.h rebus.h winixbase.h +app.o: ../../../winix/winixd/core/config.h app.o: ../../../pikotools/space/spaceparser.h app.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h app.o: log.h logmanipulators.h ../../../pikotools/log/log.h @@ -39,20 +38,22 @@ app.o: ../../../pikotools/convert/convert.h app.o: ../../../pikotools/convert/inttostr.h app.o: ../../../pikotools/convert/patternreplacer.h app.o: ../../../pikotools/convert/strtoint.h -app.o: ../../../pikotools/convert/text.h ipban.h cur.h request.h config.h +app.o: ../../../pikotools/convert/text.h ipban.h cur.h request.h +app.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +app.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +app.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +app.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +app.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +app.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +app.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +app.o: ../../../morm/src/fieldvaluehelper.h +app.o: ../../../morm/src/flatexpression.h +app.o: ../../../winix/winixd/models/itemcontent.h config.h app.o: ../../../winix/winixd/templates/htmltextstream.h app.o: ../../../winix/winixd/core/textstream.h app.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h app.o: mount.h winixmodel.h ../../../winix/winixd/core/winixbase.h plugin.h -app.o: pluginmsg.h ../../../morm/src/morm.h ../../../morm/src/morm_types.h -app.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -app.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -app.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h -app.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h -app.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -app.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h -app.o: ../../../morm/src/fieldvaluehelper.h -app.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h +app.o: pluginmsg.h ../../../morm/src/morm.h ../../../morm/src/finder.h app.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h app.o: ../../../morm/src/postgresqlexpression.h app.o: ../../../morm/src/jsonconnector.h @@ -64,7 +65,6 @@ app.o: ../../../winix/winixd/db/dbconn.h app.o: ../../../winix/winixd/db/dbtextstream.h app.o: ../../../winix/winixd/core/error.h app.o: ../../../winix/winixd/db/dbitemquery.h -app.o: ../../../winix/winixd/core/item.h app.o: ../../../winix/winixd/db/dbitemcolumns.h app.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h app.o: ../../../winix/winixd/core/dircontainer.h @@ -78,10 +78,10 @@ app.o: ../../../winix/winixd/templates/patterns.h app.o: ../../../winix/winixd/templates/locale.h app.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h app.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -app.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h -app.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -app.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h -app.o: ../../../ezc/src/patternparser.h +app.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h +app.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +app.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +app.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h app.o: ../../../winix/winixd/notify/notifythread.h app.o: ../../../winix/winixd/core/basethread.h app.o: ../../../winix/winixd/notify/templatesnotify.h @@ -165,11 +165,10 @@ basethread.o: ../../../pikotools/textstream/types.h filelog.h basethread.o: ../../../winix/winixd/core/synchro.h basethread.o: ../../../winix/winixd/core/log.h basethread.o: ../../../winix/winixd/core/filelog.h lock.h -basethread.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -basethread.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -basethread.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -basethread.o: ../../../morm/src/queryresult.h -basethread.o: ../../../morm/src/flatconnector.h +basethread.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +basethread.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +basethread.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +basethread.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h basethread.o: ../../../morm/src/dbexpression.h basethread.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h basethread.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h @@ -204,7 +203,7 @@ config.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h config.o: ../../../pikotools/convert/inttostr.h config.o: ../../../pikotools/membuffer/membuffer.h config.o: ../../../pikotools/textstream/types.h filelog.h -config.o: ../../../winix/winixd/core/synchro.h misc.h item.h requesttypes.h +config.o: ../../../winix/winixd/core/synchro.h misc.h requesttypes.h config.o: ../../../pikotools/utf8/utf8.h winix_const.h config.o: ../../../pikotools/convert/convert.h config.o: ../../../pikotools/convert/inttostr.h @@ -230,38 +229,63 @@ crypt.o: ../../../pikotools/textstream/types.h filelog.h crypt.o: ../../../winix/winixd/core/synchro.h crypt.o: ../../../winix/winixd/core/log.h crypt.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h config.h -crypt.o: user.h ../../../pikotools/utf8/utf8.h misc.h item.h requesttypes.h +crypt.o: user.h ../../../pikotools/utf8/utf8.h misc.h requesttypes.h crypt.o: winix_const.h ../../../pikotools/convert/convert.h crypt.o: ../../../pikotools/convert/inttostr.h crypt.o: ../../../pikotools/convert/patternreplacer.h crypt.o: ../../../pikotools/convert/strtoint.h crypt.o: ../../../pikotools/convert/text.h -dircontainer.o: dircontainer.h item.h ../../../pikotools/space/space.h -dircontainer.o: ../../../pikotools/date/date.h -dircontainer.o: ../../../pikotools/convert/inttostr.h winixbase.h +dircontainer.o: dircontainer.h winixbase.h dircontainer.o: ../../../winix/winixd/core/config.h dircontainer.o: ../../../pikotools/space/spaceparser.h dircontainer.o: ../../../pikotools/space/space.h dircontainer.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h dircontainer.o: ../../../pikotools/log/log.h dircontainer.o: ../../../pikotools/textstream/textstream.h +dircontainer.o: ../../../pikotools/space/space.h +dircontainer.o: ../../../pikotools/date/date.h +dircontainer.o: ../../../pikotools/convert/inttostr.h dircontainer.o: ../../../pikotools/membuffer/membuffer.h dircontainer.o: ../../../pikotools/textstream/types.h filelog.h dircontainer.o: ../../../winix/winixd/core/synchro.h dircontainer.o: ../../../winix/winixd/core/log.h dircontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -dirs.o: dirs.h item.h ../../../pikotools/space/space.h -dirs.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -dirs.o: dircontainer.h winixbase.h ../../../winix/winixd/core/config.h +dircontainer.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +dircontainer.o: ../../../morm/src/modelconnector.h +dircontainer.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h +dircontainer.o: ../../../morm/src/queryresult.h +dircontainer.o: ../../../morm/src/flatconnector.h +dircontainer.o: ../../../morm/src/dbexpression.h +dircontainer.o: ../../../morm/src/baseexpression.h +dircontainer.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +dircontainer.o: ../../../morm/src/modeldata.h +dircontainer.o: ../../../morm/src/cursorhelper.h +dircontainer.o: ../../../morm/src/finderhelper.h +dircontainer.o: ../../../morm/src/fieldvaluehelper.h +dircontainer.o: ../../../morm/src/flatexpression.h +dircontainer.o: ../../../winix/winixd/models/itemcontent.h +dirs.o: dirs.h dircontainer.h winixbase.h ../../../winix/winixd/core/config.h dirs.o: ../../../pikotools/space/spaceparser.h dirs.o: ../../../pikotools/space/space.h dirs.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h dirs.o: ../../../pikotools/log/log.h dirs.o: ../../../pikotools/textstream/textstream.h +dirs.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +dirs.o: ../../../pikotools/convert/inttostr.h dirs.o: ../../../pikotools/membuffer/membuffer.h dirs.o: ../../../pikotools/textstream/types.h filelog.h dirs.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h dirs.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h +dirs.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +dirs.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +dirs.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +dirs.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +dirs.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +dirs.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +dirs.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +dirs.o: ../../../morm/src/fieldvaluehelper.h +dirs.o: ../../../morm/src/flatexpression.h +dirs.o: ../../../winix/winixd/models/itemcontent.h dirs.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h dirs.o: ../../../winix/winixd/db/dbconn.h dirs.o: ../../../winix/winixd/db/dbtextstream.h @@ -269,7 +293,6 @@ dirs.o: ../../../winix/winixd/core/textstream.h dirs.o: ../../../winix/winixd/core/winixbase.h dirs.o: ../../../winix/winixd/core/error.h dirs.o: ../../../winix/winixd/db/dbitemquery.h -dirs.o: ../../../winix/winixd/core/item.h dirs.o: ../../../winix/winixd/db/dbitemcolumns.h dirs.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h dirs.o: ../../../winix/winixd/core/dircontainer.h @@ -283,15 +306,7 @@ dirs.o: ../../../pikotools/convert/text.h dirs.o: ../../../winix/winixd/templates/htmltextstream.h dirs.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h dirs.o: winixmodel.h plugin.h pluginmsg.h plugindata.h -dirs.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -dirs.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -dirs.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -dirs.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h -dirs.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h -dirs.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -dirs.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h -dirs.o: ../../../morm/src/fieldvaluehelper.h -dirs.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h +dirs.o: ../../../morm/src/morm.h ../../../morm/src/finder.h dirs.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h dirs.o: ../../../morm/src/postgresqlexpression.h dirs.o: ../../../morm/src/jsonconnector.h @@ -305,10 +320,10 @@ dirs.o: ../../../winix/winixd/templates/patterns.h dirs.o: ../../../winix/winixd/templates/locale.h dirs.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h dirs.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -dirs.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h -dirs.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -dirs.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h -dirs.o: ../../../ezc/src/patternparser.h +dirs.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h +dirs.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +dirs.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +dirs.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h dirs.o: ../../../winix/winixd/notify/notifythread.h dirs.o: ../../../winix/winixd/core/basethread.h dirs.o: ../../../winix/winixd/notify/templatesnotify.h @@ -343,7 +358,6 @@ groups.o: ../../../pikotools/space/spaceparser.h groups.o: ../../../pikotools/space/space.h groups.o: ../../../pikotools/textstream/types.h groups.o: ../../../winix/winixd/db/dbitemquery.h -groups.o: ../../../winix/winixd/core/item.h groups.o: ../../../winix/winixd/db/dbitemcolumns.h groups.o: ../../../winix/winixd/core/user.h groups.o: ../../../winix/winixd/core/group.h @@ -354,14 +368,14 @@ groups.o: ../../../pikotools/log/log.h filelog.h groups.o: ../../../winix/winixd/core/synchro.h groups.o: ../../../winix/winixd/core/log.h groups.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h winixmodel.h -groups.o: plugin.h pluginmsg.h plugindata.h ../../../morm/src/morm.h -groups.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h +groups.o: plugin.h pluginmsg.h plugindata.h groups.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h groups.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -groups.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -groups.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -groups.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -groups.o: ../../../morm/src/finderhelper.h +groups.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +groups.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h +groups.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h +groups.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +groups.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h groups.o: ../../../morm/src/fieldvaluehelper.h groups.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h groups.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h @@ -388,13 +402,13 @@ httpsimpleparser.o: ../../../pikotools/textstream/types.h filelog.h httpsimpleparser.o: ../../../winix/winixd/core/synchro.h httpsimpleparser.o: ../../../winix/winixd/core/log.h httpsimpleparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -httpsimpleparser.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -httpsimpleparser.o: ../../../morm/src/model.h httpsimpleparser.o: ../../../morm/src/modelconnector.h httpsimpleparser.o: ../../../morm/src/clearer.h httpsimpleparser.o: ../../../morm/src/dbconnector.h httpsimpleparser.o: ../../../morm/src/queryresult.h httpsimpleparser.o: ../../../morm/src/flatconnector.h +httpsimpleparser.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h +httpsimpleparser.o: ../../../morm/src/model.h httpsimpleparser.o: ../../../morm/src/dbexpression.h httpsimpleparser.o: ../../../morm/src/baseexpression.h httpsimpleparser.o: ../../../morm/src/modelenv.h @@ -409,7 +423,7 @@ httpsimpleparser.o: ../../../morm/src/jsonexpression.h httpsimpleparser.o: ../../../morm/src/postgresqlexpression.h httpsimpleparser.o: ../../../morm/src/jsonconnector.h httpsimpleparser.o: ../../../morm/src/postgresqlconnector.h -httpsimpleparser.o: ../../../morm/src/postgresqlqueryresult.h misc.h item.h +httpsimpleparser.o: ../../../morm/src/postgresqlqueryresult.h misc.h httpsimpleparser.o: requesttypes.h winix_const.h httpsimpleparser.o: ../../../pikotools/convert/convert.h httpsimpleparser.o: ../../../pikotools/convert/inttostr.h @@ -430,14 +444,14 @@ image.o: ../../../pikotools/membuffer/membuffer.h image.o: ../../../pikotools/textstream/types.h filelog.h image.o: ../../../winix/winixd/core/synchro.h image.o: ../../../winix/winixd/core/log.h -image.o: ../../../winix/winixd/core/filelog.h lock.h ../../../morm/src/morm.h -image.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h +image.o: ../../../winix/winixd/core/filelog.h lock.h image.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h image.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -image.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -image.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -image.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -image.o: ../../../morm/src/finderhelper.h +image.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +image.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h +image.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h +image.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +image.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h image.o: ../../../morm/src/fieldvaluehelper.h image.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h image.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h @@ -445,7 +459,7 @@ image.o: ../../../morm/src/jsonexpression.h image.o: ../../../morm/src/postgresqlexpression.h image.o: ../../../morm/src/jsonconnector.h image.o: ../../../morm/src/postgresqlconnector.h -image.o: ../../../morm/src/postgresqlqueryresult.h textstream.h misc.h item.h +image.o: ../../../morm/src/postgresqlqueryresult.h textstream.h misc.h image.o: requesttypes.h winix_const.h ../../../pikotools/convert/convert.h image.o: ../../../pikotools/convert/inttostr.h image.o: ../../../pikotools/convert/patternreplacer.h @@ -456,11 +470,12 @@ image.o: ../../../winix/winixd/db/dbtextstream.h image.o: ../../../winix/winixd/core/textstream.h image.o: ../../../winix/winixd/core/error.h image.o: ../../../winix/winixd/db/dbitemquery.h -image.o: ../../../winix/winixd/core/item.h image.o: ../../../winix/winixd/db/dbitemcolumns.h image.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h image.o: ../../../winix/winixd/core/dircontainer.h -image.o: ../../../winix/winixd/core/ugcontainer.h system.h job.h dirs.h +image.o: ../../../winix/winixd/core/ugcontainer.h +image.o: ../../../winix/winixd/models/item.h +image.o: ../../../winix/winixd/models/itemcontent.h system.h job.h dirs.h image.o: dircontainer.h request.h error.h config.h image.o: ../../../winix/winixd/templates/htmltextstream.h image.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h @@ -475,10 +490,11 @@ image.o: ../../../winix/winixd/templates/patterns.h image.o: ../../../winix/winixd/templates/locale.h image.o: ../../../winix/winixd/templates/localefilter.h image.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -image.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h -image.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -image.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -image.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h +image.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +image.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h +image.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h +image.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +image.o: ../../../ezc/src/patternparser.h image.o: ../../../winix/winixd/notify/notifythread.h image.o: ../../../winix/winixd/core/basethread.h image.o: ../../../winix/winixd/notify/templatesnotify.h @@ -501,12 +517,11 @@ ipbancontainer.o: ../../../pikotools/textstream/types.h filelog.h ipbancontainer.o: ../../../winix/winixd/core/synchro.h ipbancontainer.o: ../../../winix/winixd/core/log.h ipbancontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -ipbancontainer.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -ipbancontainer.o: ../../../morm/src/model.h ipbancontainer.o: ../../../morm/src/modelconnector.h ipbancontainer.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h ipbancontainer.o: ../../../morm/src/queryresult.h -ipbancontainer.o: ../../../morm/src/flatconnector.h +ipbancontainer.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +ipbancontainer.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h ipbancontainer.o: ../../../morm/src/dbexpression.h ipbancontainer.o: ../../../morm/src/baseexpression.h ipbancontainer.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h @@ -521,23 +536,6 @@ ipbancontainer.o: ../../../morm/src/postgresqlexpression.h ipbancontainer.o: ../../../morm/src/jsonconnector.h ipbancontainer.o: ../../../morm/src/postgresqlconnector.h ipbancontainer.o: ../../../morm/src/postgresqlqueryresult.h -item.o: item.h ../../../pikotools/space/space.h -item.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -item.o: misc.h requesttypes.h ../../../pikotools/textstream/textstream.h -item.o: ../../../pikotools/membuffer/membuffer.h -item.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h -item.o: winix_const.h ../../../pikotools/convert/convert.h -item.o: ../../../pikotools/convert/inttostr.h -item.o: ../../../pikotools/convert/patternreplacer.h -item.o: ../../../pikotools/convert/strtoint.h -item.o: ../../../pikotools/convert/text.h crypt.h run.h winixbase.h -item.o: ../../../winix/winixd/core/config.h -item.o: ../../../pikotools/space/spaceparser.h -item.o: ../../../pikotools/space/space.h -item.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h -item.o: ../../../pikotools/log/log.h filelog.h -item.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h -item.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h config.h user.h job.o: job.h basethread.h synchro.h winixmodel.h job.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h job.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h @@ -550,14 +548,15 @@ job.o: ../../../pikotools/convert/inttostr.h job.o: ../../../pikotools/membuffer/membuffer.h job.o: ../../../pikotools/textstream/types.h filelog.h job.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h -job.o: ../../../winix/winixd/core/filelog.h lock.h ../../../morm/src/morm.h -job.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h +job.o: ../../../winix/winixd/core/filelog.h lock.h job.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h job.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -job.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -job.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -job.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -job.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h +job.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +job.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h +job.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h +job.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +job.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +job.o: ../../../morm/src/fieldvaluehelper.h job.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h job.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h job.o: ../../../morm/src/jsonexpression.h @@ -579,8 +578,8 @@ lastcontainer.o: ../../../pikotools/textstream/types.h filelog.h lastcontainer.o: ../../../winix/winixd/core/synchro.h lastcontainer.o: ../../../winix/winixd/core/log.h lastcontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h -lastcontainer.o: item.h requesttypes.h ../../../pikotools/utf8/utf8.h -lastcontainer.o: winix_const.h ../../../pikotools/convert/convert.h +lastcontainer.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h +lastcontainer.o: ../../../pikotools/convert/convert.h lastcontainer.o: ../../../pikotools/convert/inttostr.h lastcontainer.o: ../../../pikotools/convert/patternreplacer.h lastcontainer.o: ../../../pikotools/convert/strtoint.h @@ -598,7 +597,7 @@ loadavg.o: ../../../pikotools/textstream/types.h filelog.h loadavg.o: ../../../winix/winixd/core/synchro.h loadavg.o: ../../../winix/winixd/core/log.h loadavg.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h -loadavg.o: item.h requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h +loadavg.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h loadavg.o: ../../../pikotools/convert/convert.h loadavg.o: ../../../pikotools/convert/inttostr.h loadavg.o: ../../../pikotools/convert/patternreplacer.h @@ -612,9 +611,9 @@ log.o: ../../../pikotools/convert/inttostr.h log.o: ../../../pikotools/membuffer/membuffer.h log.o: ../../../pikotools/textstream/types.h filelog.h log.o: ../../../winix/winixd/core/synchro.h ../../../pikotools/utf8/utf8.h -misc.o: misc.h item.h ../../../pikotools/space/space.h -misc.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -misc.o: requesttypes.h ../../../pikotools/textstream/textstream.h +misc.o: misc.h requesttypes.h ../../../pikotools/textstream/textstream.h +misc.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +misc.o: ../../../pikotools/convert/inttostr.h misc.o: ../../../pikotools/membuffer/membuffer.h misc.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h misc.o: winix_const.h ../../../pikotools/convert/convert.h @@ -624,15 +623,24 @@ misc.o: ../../../pikotools/convert/strtoint.h misc.o: ../../../pikotools/convert/text.h misc.o: ../../../winix/winixd/templates/templates.h ../../../ezc/src/ezc.h misc.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -misc.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h -misc.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -misc.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h -misc.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h -misc.o: ../../../pikotools/log/log.h filelog.h -misc.o: ../../../winix/winixd/core/synchro.h +misc.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h +misc.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +misc.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +misc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +misc.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h +misc.o: filelog.h ../../../winix/winixd/core/synchro.h misc.o: ../../../winix/winixd/templates/patterncacher.h -misc.o: ../../../winix/winixd/core/item.h misc.o: ../../../winix/winixd/core/winixbase.h +misc.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +misc.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +misc.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +misc.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +misc.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +misc.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +misc.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +misc.o: ../../../morm/src/fieldvaluehelper.h +misc.o: ../../../morm/src/flatexpression.h +misc.o: ../../../winix/winixd/models/itemcontent.h misc.o: ../../../winix/winixd/templates/indexpatterns.h misc.o: ../../../winix/winixd/templates/patterns.h misc.o: ../../../winix/winixd/templates/locale.h @@ -664,9 +672,10 @@ misc.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h misc.o: ../../../pikotools/space/spacetojson.h session.h user.h plugindata.h misc.o: rebus.h ipban.h mount.h ../../../winix/winixd/templates/locale.h misc.o: ../../../pikotools/convert/patternreplacer.h -mount.o: mount.h misc.h item.h ../../../pikotools/space/space.h -mount.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -mount.o: requesttypes.h ../../../pikotools/textstream/textstream.h +mount.o: mount.h misc.h requesttypes.h +mount.o: ../../../pikotools/textstream/textstream.h +mount.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +mount.o: ../../../pikotools/convert/inttostr.h mount.o: ../../../pikotools/membuffer/membuffer.h mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h mount.o: winix_const.h ../../../pikotools/convert/convert.h @@ -674,20 +683,34 @@ mount.o: ../../../pikotools/convert/inttostr.h mount.o: ../../../pikotools/convert/patternreplacer.h mount.o: ../../../pikotools/convert/strtoint.h mount.o: ../../../pikotools/convert/text.h -mountparser.o: mountparser.h mount.h item.h ../../../pikotools/space/space.h -mountparser.o: ../../../pikotools/date/date.h -mountparser.o: ../../../pikotools/convert/inttostr.h dirs.h dircontainer.h -mountparser.o: winixbase.h ../../../winix/winixd/core/config.h +mountparser.o: mountparser.h mount.h dirs.h dircontainer.h winixbase.h +mountparser.o: ../../../winix/winixd/core/config.h mountparser.o: ../../../pikotools/space/spaceparser.h mountparser.o: ../../../pikotools/space/space.h mountparser.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h mountparser.o: ../../../pikotools/log/log.h mountparser.o: ../../../pikotools/textstream/textstream.h +mountparser.o: ../../../pikotools/space/space.h +mountparser.o: ../../../pikotools/date/date.h +mountparser.o: ../../../pikotools/convert/inttostr.h mountparser.o: ../../../pikotools/membuffer/membuffer.h mountparser.o: ../../../pikotools/textstream/types.h filelog.h mountparser.o: ../../../winix/winixd/core/synchro.h mountparser.o: ../../../winix/winixd/core/log.h mountparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h +mountparser.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +mountparser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +mountparser.o: ../../../morm/src/dbconnector.h +mountparser.o: ../../../morm/src/queryresult.h +mountparser.o: ../../../morm/src/flatconnector.h +mountparser.o: ../../../morm/src/dbexpression.h +mountparser.o: ../../../morm/src/baseexpression.h +mountparser.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +mountparser.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +mountparser.o: ../../../morm/src/finderhelper.h +mountparser.o: ../../../morm/src/fieldvaluehelper.h +mountparser.o: ../../../morm/src/flatexpression.h +mountparser.o: ../../../winix/winixd/models/itemcontent.h mountparser.o: ../../../winix/winixd/db/db.h mountparser.o: ../../../winix/winixd/db/dbbase.h mountparser.o: ../../../winix/winixd/db/dbconn.h @@ -696,7 +719,6 @@ mountparser.o: ../../../winix/winixd/core/textstream.h mountparser.o: ../../../winix/winixd/core/winixbase.h mountparser.o: ../../../winix/winixd/core/error.h mountparser.o: ../../../winix/winixd/db/dbitemquery.h -mountparser.o: ../../../winix/winixd/core/item.h mountparser.o: ../../../winix/winixd/db/dbitemcolumns.h mountparser.o: ../../../winix/winixd/core/user.h mountparser.o: ../../../winix/winixd/core/group.h @@ -713,37 +735,36 @@ mountparser.o: ../../../winix/winixd/templates/htmltextstream.h mountparser.o: ../../../pikotools/space/spacetojson.h mountparser.o: ../../../ezc/src/outstreams.h winixmodel.h plugin.h mountparser.o: pluginmsg.h plugindata.h ../../../morm/src/morm.h -mountparser.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -mountparser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -mountparser.o: ../../../morm/src/dbconnector.h -mountparser.o: ../../../morm/src/queryresult.h -mountparser.o: ../../../morm/src/flatconnector.h -mountparser.o: ../../../morm/src/dbexpression.h -mountparser.o: ../../../morm/src/baseexpression.h -mountparser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -mountparser.o: ../../../morm/src/cursorhelper.h -mountparser.o: ../../../morm/src/finderhelper.h -mountparser.o: ../../../morm/src/fieldvaluehelper.h -mountparser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -mountparser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +mountparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +mountparser.o: ../../../morm/src/jsonexpression.h mountparser.o: ../../../morm/src/postgresqlexpression.h mountparser.o: ../../../morm/src/jsonconnector.h mountparser.o: ../../../morm/src/postgresqlconnector.h mountparser.o: ../../../morm/src/postgresqlqueryresult.h -mounts.o: mounts.h mount.h error.h dirs.h item.h -mounts.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h -mounts.o: ../../../pikotools/convert/inttostr.h dircontainer.h winixbase.h +mounts.o: mounts.h mount.h error.h dirs.h dircontainer.h winixbase.h mounts.o: ../../../winix/winixd/core/config.h mounts.o: ../../../pikotools/space/spaceparser.h mounts.o: ../../../pikotools/space/space.h mounts.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h mounts.o: ../../../pikotools/log/log.h mounts.o: ../../../pikotools/textstream/textstream.h +mounts.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h +mounts.o: ../../../pikotools/convert/inttostr.h mounts.o: ../../../pikotools/membuffer/membuffer.h mounts.o: ../../../pikotools/textstream/types.h filelog.h mounts.o: ../../../winix/winixd/core/synchro.h mounts.o: ../../../winix/winixd/core/log.h mounts.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h +mounts.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +mounts.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +mounts.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +mounts.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +mounts.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +mounts.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +mounts.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +mounts.o: ../../../morm/src/fieldvaluehelper.h +mounts.o: ../../../morm/src/flatexpression.h +mounts.o: ../../../winix/winixd/models/itemcontent.h mounts.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h mounts.o: ../../../winix/winixd/db/dbconn.h mounts.o: ../../../winix/winixd/db/dbtextstream.h @@ -751,7 +772,6 @@ mounts.o: ../../../winix/winixd/core/textstream.h mounts.o: ../../../winix/winixd/core/winixbase.h mounts.o: ../../../winix/winixd/core/error.h mounts.o: ../../../winix/winixd/db/dbitemquery.h -mounts.o: ../../../winix/winixd/core/item.h mounts.o: ../../../winix/winixd/db/dbitemcolumns.h mounts.o: ../../../winix/winixd/core/user.h mounts.o: ../../../winix/winixd/core/group.h @@ -766,16 +786,7 @@ mounts.o: ../../../pikotools/convert/text.h mounts.o: ../../../winix/winixd/templates/htmltextstream.h mounts.o: ../../../pikotools/space/spacetojson.h mounts.o: ../../../ezc/src/outstreams.h winixmodel.h plugin.h pluginmsg.h -mounts.o: plugindata.h ../../../morm/src/morm.h -mounts.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -mounts.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -mounts.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -mounts.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -mounts.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -mounts.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -mounts.o: ../../../morm/src/finderhelper.h -mounts.o: ../../../morm/src/fieldvaluehelper.h -mounts.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h +mounts.o: plugindata.h ../../../morm/src/morm.h ../../../morm/src/finder.h mounts.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h mounts.o: ../../../morm/src/postgresqlexpression.h mounts.o: ../../../morm/src/jsonconnector.h @@ -795,8 +806,11 @@ plugin.o: ../../../pikotools/membuffer/membuffer.h plugin.o: ../../../pikotools/textstream/types.h filelog.h plugin.o: ../../../winix/winixd/core/synchro.h plugin.o: ../../../winix/winixd/core/log.h -plugin.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h item.h -plugin.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h +plugin.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h +plugin.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +plugin.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +plugin.o: ../../../morm/src/flatconnector.h misc.h requesttypes.h +plugin.o: ../../../pikotools/utf8/utf8.h winix_const.h plugin.o: ../../../pikotools/convert/convert.h plugin.o: ../../../pikotools/convert/inttostr.h plugin.o: ../../../pikotools/convert/patternreplacer.h @@ -804,12 +818,10 @@ plugin.o: ../../../pikotools/convert/strtoint.h plugin.o: ../../../pikotools/convert/text.h system.h job.h basethread.h plugin.o: winixmodel.h ../../../winix/winixd/core/winixbase.h plugin.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -plugin.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -plugin.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -plugin.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h -plugin.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h -plugin.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -plugin.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +plugin.o: ../../../morm/src/model.h ../../../morm/src/dbexpression.h +plugin.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h +plugin.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +plugin.o: ../../../morm/src/finderhelper.h plugin.o: ../../../morm/src/fieldvaluehelper.h plugin.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h plugin.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h @@ -817,13 +829,14 @@ plugin.o: ../../../morm/src/postgresqlexpression.h plugin.o: ../../../morm/src/jsonconnector.h plugin.o: ../../../morm/src/postgresqlconnector.h plugin.o: ../../../morm/src/postgresqlqueryresult.h dirs.h dircontainer.h +plugin.o: ../../../winix/winixd/models/item.h +plugin.o: ../../../winix/winixd/models/itemcontent.h plugin.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h plugin.o: ../../../winix/winixd/db/dbconn.h plugin.o: ../../../winix/winixd/db/dbtextstream.h plugin.o: ../../../winix/winixd/core/textstream.h plugin.o: ../../../winix/winixd/core/error.h plugin.o: ../../../winix/winixd/db/dbitemquery.h -plugin.o: ../../../winix/winixd/core/item.h plugin.o: ../../../winix/winixd/db/dbitemcolumns.h plugin.o: ../../../winix/winixd/core/user.h plugin.o: ../../../winix/winixd/core/group.h @@ -842,10 +855,10 @@ plugin.o: ../../../winix/winixd/templates/patterns.h plugin.o: ../../../winix/winixd/templates/locale.h plugin.o: ../../../winix/winixd/templates/localefilter.h plugin.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -plugin.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h -plugin.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -plugin.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -plugin.o: ../../../ezc/src/expressionparser.h +plugin.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +plugin.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h +plugin.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h +plugin.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h plugin.o: ../../../ezc/src/patternparser.h plugin.o: ../../../winix/winixd/notify/notifythread.h plugin.o: ../../../winix/winixd/core/basethread.h @@ -926,6 +939,9 @@ plugindata.o: ../../../pikotools/textstream/types.h filelog.h plugindata.o: ../../../winix/winixd/core/synchro.h plugindata.o: ../../../winix/winixd/core/log.h plugindata.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h +plugindata.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +plugindata.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +plugindata.o: ../../../morm/src/flatconnector.h postmultiparser.o: postmultiparser.h error.h requesttypes.h postmultiparser.o: ../../../pikotools/textstream/textstream.h postmultiparser.o: ../../../pikotools/space/space.h @@ -933,7 +949,7 @@ postmultiparser.o: ../../../pikotools/date/date.h postmultiparser.o: ../../../pikotools/convert/inttostr.h postmultiparser.o: ../../../pikotools/membuffer/membuffer.h postmultiparser.o: ../../../pikotools/textstream/types.h config.h misc.h -postmultiparser.o: item.h ../../../pikotools/utf8/utf8.h winix_const.h +postmultiparser.o: ../../../pikotools/utf8/utf8.h winix_const.h postmultiparser.o: ../../../pikotools/convert/convert.h postmultiparser.o: ../../../pikotools/convert/inttostr.h postmultiparser.o: ../../../pikotools/convert/patternreplacer.h @@ -960,13 +976,23 @@ rebus.o: ../../../pikotools/space/spaceparser.h rebus.o: ../../../pikotools/space/space.h rebus.o: ../../../pikotools/textstream/types.h rebus.o: ../../../winix/winixd/core/log.h -rebus.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h item.h +rebus.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h rebus.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h rebus.o: ../../../pikotools/convert/convert.h rebus.o: ../../../pikotools/convert/inttostr.h rebus.o: ../../../pikotools/convert/patternreplacer.h rebus.o: ../../../pikotools/convert/strtoint.h -rebus.o: ../../../pikotools/convert/text.h cur.h request.h error.h config.h +rebus.o: ../../../pikotools/convert/text.h cur.h request.h +rebus.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +rebus.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +rebus.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +rebus.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +rebus.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +rebus.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +rebus.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +rebus.o: ../../../morm/src/fieldvaluehelper.h +rebus.o: ../../../morm/src/flatexpression.h +rebus.o: ../../../winix/winixd/models/itemcontent.h error.h config.h rebus.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h rebus.o: ../../../winix/winixd/core/textstream.h rebus.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h @@ -976,7 +1002,19 @@ request.o: ../../../pikotools/textstream/textstream.h request.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h request.o: ../../../pikotools/convert/inttostr.h request.o: ../../../pikotools/membuffer/membuffer.h -request.o: ../../../pikotools/textstream/types.h item.h error.h config.h +request.o: ../../../pikotools/textstream/types.h +request.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +request.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +request.o: ../../../morm/src/dbconnector.h ../../../pikotools/log/log.h +request.o: filelog.h ../../../winix/winixd/core/synchro.h +request.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h +request.o: ../../../morm/src/dbexpression.h +request.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +request.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +request.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +request.o: ../../../morm/src/fieldvaluehelper.h +request.o: ../../../morm/src/flatexpression.h +request.o: ../../../winix/winixd/models/itemcontent.h error.h config.h request.o: textstream.h misc.h ../../../pikotools/utf8/utf8.h winix_const.h request.o: ../../../pikotools/convert/convert.h request.o: ../../../pikotools/convert/inttostr.h @@ -988,10 +1026,9 @@ request.o: ../../../winix/winixd/core/textstream.h request.o: ../../../pikotools/space/spacetojson.h request.o: ../../../pikotools/space/space.h request.o: ../../../pikotools/textstream/types.h -request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h -request.o: ../../../pikotools/log/log.h filelog.h -request.o: ../../../winix/winixd/core/synchro.h plugin.h pluginmsg.h -request.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h +request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h plugin.h +request.o: pluginmsg.h plugindata.h winixbase.h +request.o: ../../../winix/winixd/core/config.h request.o: ../../../pikotools/space/spaceparser.h request.o: ../../../winix/winixd/core/log.h request.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h @@ -1006,10 +1043,10 @@ run.o: ../../../pikotools/membuffer/membuffer.h run.o: ../../../pikotools/textstream/types.h filelog.h run.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h run.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -session.o: session.h item.h ../../../pikotools/space/space.h +session.o: session.h error.h user.h ../../../pikotools/space/space.h session.o: ../../../pikotools/date/date.h -session.o: ../../../pikotools/convert/inttostr.h error.h user.h plugindata.h -session.o: rebus.h winixbase.h ../../../winix/winixd/core/config.h +session.o: ../../../pikotools/convert/inttostr.h plugindata.h rebus.h +session.o: winixbase.h ../../../winix/winixd/core/config.h session.o: ../../../pikotools/space/spaceparser.h session.o: ../../../pikotools/space/space.h session.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h @@ -1026,12 +1063,11 @@ session.o: ../../../pikotools/convert/inttostr.h session.o: ../../../pikotools/convert/patternreplacer.h session.o: ../../../pikotools/convert/strtoint.h session.o: ../../../pikotools/convert/text.h ipban.h -sessioncontainer.o: sessioncontainer.h session.h item.h +sessioncontainer.o: sessioncontainer.h session.h error.h user.h sessioncontainer.o: ../../../pikotools/space/space.h sessioncontainer.o: ../../../pikotools/date/date.h -sessioncontainer.o: ../../../pikotools/convert/inttostr.h error.h user.h -sessioncontainer.o: plugindata.h rebus.h winixbase.h -sessioncontainer.o: ../../../winix/winixd/core/config.h +sessioncontainer.o: ../../../pikotools/convert/inttostr.h plugindata.h +sessioncontainer.o: rebus.h winixbase.h ../../../winix/winixd/core/config.h sessioncontainer.o: ../../../pikotools/space/spaceparser.h sessioncontainer.o: ../../../pikotools/space/space.h sessioncontainer.o: ../../../pikotools/textstream/types.h log.h @@ -1049,13 +1085,8 @@ sessioncontainer.o: ../../../pikotools/convert/inttostr.h sessioncontainer.o: ../../../pikotools/convert/patternreplacer.h sessioncontainer.o: ../../../pikotools/convert/strtoint.h sessioncontainer.o: ../../../pikotools/convert/text.h ipban.h cur.h request.h -sessioncontainer.o: config.h ../../../winix/winixd/templates/htmltextstream.h -sessioncontainer.o: ../../../winix/winixd/core/textstream.h -sessioncontainer.o: ../../../pikotools/space/spacetojson.h -sessioncontainer.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h -sessioncontainer.o: ../../../winix/winixd/core/winixbase.h plugin.h -sessioncontainer.o: pluginmsg.h ../../../morm/src/morm.h -sessioncontainer.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h +sessioncontainer.o: ../../../winix/winixd/models/item.h +sessioncontainer.o: ../../../morm/src/model.h sessioncontainer.o: ../../../morm/src/modelconnector.h sessioncontainer.o: ../../../morm/src/clearer.h sessioncontainer.o: ../../../morm/src/dbconnector.h @@ -1063,12 +1094,20 @@ sessioncontainer.o: ../../../morm/src/queryresult.h sessioncontainer.o: ../../../morm/src/flatconnector.h sessioncontainer.o: ../../../morm/src/dbexpression.h sessioncontainer.o: ../../../morm/src/baseexpression.h +sessioncontainer.o: ../../../morm/src/morm_types.h sessioncontainer.o: ../../../morm/src/modelenv.h sessioncontainer.o: ../../../morm/src/modeldata.h sessioncontainer.o: ../../../morm/src/cursorhelper.h sessioncontainer.o: ../../../morm/src/finderhelper.h sessioncontainer.o: ../../../morm/src/fieldvaluehelper.h sessioncontainer.o: ../../../morm/src/flatexpression.h +sessioncontainer.o: ../../../winix/winixd/models/itemcontent.h config.h +sessioncontainer.o: ../../../winix/winixd/templates/htmltextstream.h +sessioncontainer.o: ../../../winix/winixd/core/textstream.h +sessioncontainer.o: ../../../pikotools/space/spacetojson.h +sessioncontainer.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h +sessioncontainer.o: ../../../winix/winixd/core/winixbase.h plugin.h +sessioncontainer.o: pluginmsg.h ../../../morm/src/morm.h sessioncontainer.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h sessioncontainer.o: ../../../morm/src/jsonexpression.h sessioncontainer.o: ../../../morm/src/postgresqlexpression.h @@ -1090,19 +1129,17 @@ sessionidmanager.o: ../../../pikotools/textstream/types.h filelog.h sessionidmanager.o: ../../../winix/winixd/core/synchro.h sessionidmanager.o: ../../../winix/winixd/core/log.h sessionidmanager.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -sessionidmanager.o: ../../../pikotools/utf8/utf8.h misc.h item.h -sessionidmanager.o: requesttypes.h winix_const.h -sessionidmanager.o: ../../../pikotools/convert/convert.h +sessionidmanager.o: ../../../pikotools/utf8/utf8.h misc.h requesttypes.h +sessionidmanager.o: winix_const.h ../../../pikotools/convert/convert.h sessionidmanager.o: ../../../pikotools/convert/inttostr.h sessionidmanager.o: ../../../pikotools/convert/patternreplacer.h sessionidmanager.o: ../../../pikotools/convert/strtoint.h sessionidmanager.o: ../../../pikotools/convert/text.h -sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h -sessionmanager.o: ../../../pikotools/space/space.h +sessionmanager.o: sessionmanager.h sessioncontainer.h session.h error.h +sessionmanager.o: user.h ../../../pikotools/space/space.h sessionmanager.o: ../../../pikotools/date/date.h -sessionmanager.o: ../../../pikotools/convert/inttostr.h error.h user.h -sessionmanager.o: plugindata.h rebus.h winixbase.h -sessionmanager.o: ../../../winix/winixd/core/config.h +sessionmanager.o: ../../../pikotools/convert/inttostr.h plugindata.h rebus.h +sessionmanager.o: winixbase.h ../../../winix/winixd/core/config.h sessionmanager.o: ../../../pikotools/space/spaceparser.h sessionmanager.o: ../../../pikotools/space/space.h sessionmanager.o: ../../../pikotools/textstream/types.h log.h @@ -1120,12 +1157,7 @@ sessionmanager.o: ../../../pikotools/convert/inttostr.h sessionmanager.o: ../../../pikotools/convert/patternreplacer.h sessionmanager.o: ../../../pikotools/convert/strtoint.h sessionmanager.o: ../../../pikotools/convert/text.h ipban.h cur.h request.h -sessionmanager.o: config.h ../../../winix/winixd/templates/htmltextstream.h -sessionmanager.o: ../../../winix/winixd/core/textstream.h -sessionmanager.o: ../../../pikotools/space/spacetojson.h -sessionmanager.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h -sessionmanager.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h -sessionmanager.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h +sessionmanager.o: ../../../winix/winixd/models/item.h sessionmanager.o: ../../../morm/src/model.h sessionmanager.o: ../../../morm/src/modelconnector.h sessionmanager.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h @@ -1133,12 +1165,20 @@ sessionmanager.o: ../../../morm/src/queryresult.h sessionmanager.o: ../../../morm/src/flatconnector.h sessionmanager.o: ../../../morm/src/dbexpression.h sessionmanager.o: ../../../morm/src/baseexpression.h -sessionmanager.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +sessionmanager.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +sessionmanager.o: ../../../morm/src/modeldata.h sessionmanager.o: ../../../morm/src/cursorhelper.h sessionmanager.o: ../../../morm/src/finderhelper.h sessionmanager.o: ../../../morm/src/fieldvaluehelper.h sessionmanager.o: ../../../morm/src/flatexpression.h -sessionmanager.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +sessionmanager.o: ../../../winix/winixd/models/itemcontent.h config.h +sessionmanager.o: ../../../winix/winixd/templates/htmltextstream.h +sessionmanager.o: ../../../winix/winixd/core/textstream.h +sessionmanager.o: ../../../pikotools/space/spacetojson.h +sessionmanager.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h +sessionmanager.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h +sessionmanager.o: ../../../morm/src/morm.h ../../../morm/src/finder.h +sessionmanager.o: ../../../morm/src/cursor.h sessionmanager.o: ../../../morm/src/jsonexpression.h sessionmanager.o: ../../../morm/src/postgresqlexpression.h sessionmanager.o: ../../../morm/src/jsonconnector.h @@ -1151,7 +1191,6 @@ sessionmanager.o: ../../../winix/winixd/db/dbconn.h sessionmanager.o: ../../../winix/winixd/db/dbtextstream.h sessionmanager.o: ../../../winix/winixd/core/error.h sessionmanager.o: ../../../winix/winixd/db/dbitemquery.h -sessionmanager.o: ../../../winix/winixd/core/item.h sessionmanager.o: ../../../winix/winixd/db/dbitemcolumns.h sessionmanager.o: ../../../winix/winixd/core/user.h sessionmanager.o: ../../../winix/winixd/core/group.h @@ -1167,9 +1206,10 @@ sessionmanager.o: ../../../winix/winixd/templates/patterns.h sessionmanager.o: ../../../winix/winixd/templates/locale.h sessionmanager.o: ../../../winix/winixd/templates/localefilter.h sessionmanager.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -sessionmanager.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h -sessionmanager.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -sessionmanager.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +sessionmanager.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +sessionmanager.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h +sessionmanager.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h +sessionmanager.o: ../../../ezc/src/pattern.h sessionmanager.o: ../../../ezc/src/expressionparser.h sessionmanager.o: ../../../ezc/src/patternparser.h sessionmanager.o: ../../../winix/winixd/notify/notifythread.h @@ -1187,12 +1227,11 @@ sessionmanager.o: ../../../winix/winixd/core/winixsystem.h sessionmanager.o: ../../../winix/winixd/core/cur.h sessionmanager.o: ../../../winix/winixd/core/sessionmanager.h sessionmanager.o: ../../../winix/winixd/core/slog.h -sessionparser.o: sessionparser.h session.h item.h +sessionparser.o: sessionparser.h session.h error.h user.h sessionparser.o: ../../../pikotools/space/space.h sessionparser.o: ../../../pikotools/date/date.h -sessionparser.o: ../../../pikotools/convert/inttostr.h error.h user.h -sessionparser.o: plugindata.h rebus.h winixbase.h -sessionparser.o: ../../../winix/winixd/core/config.h +sessionparser.o: ../../../pikotools/convert/inttostr.h plugindata.h rebus.h +sessionparser.o: winixbase.h ../../../winix/winixd/core/config.h sessionparser.o: ../../../pikotools/space/spaceparser.h sessionparser.o: ../../../pikotools/space/space.h sessionparser.o: ../../../pikotools/textstream/types.h log.h @@ -1210,25 +1249,27 @@ sessionparser.o: ../../../pikotools/convert/inttostr.h sessionparser.o: ../../../pikotools/convert/patternreplacer.h sessionparser.o: ../../../pikotools/convert/strtoint.h sessionparser.o: ../../../pikotools/convert/text.h ipban.h sessioncontainer.h -sessionparser.o: cur.h request.h config.h -sessionparser.o: ../../../winix/winixd/templates/htmltextstream.h -sessionparser.o: ../../../winix/winixd/core/textstream.h -sessionparser.o: ../../../pikotools/space/spacetojson.h -sessionparser.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h -sessionparser.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h -sessionparser.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h +sessionparser.o: cur.h request.h ../../../winix/winixd/models/item.h sessionparser.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h sessionparser.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h sessionparser.o: ../../../morm/src/queryresult.h sessionparser.o: ../../../morm/src/flatconnector.h sessionparser.o: ../../../morm/src/dbexpression.h sessionparser.o: ../../../morm/src/baseexpression.h -sessionparser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +sessionparser.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +sessionparser.o: ../../../morm/src/modeldata.h sessionparser.o: ../../../morm/src/cursorhelper.h sessionparser.o: ../../../morm/src/finderhelper.h sessionparser.o: ../../../morm/src/fieldvaluehelper.h sessionparser.o: ../../../morm/src/flatexpression.h -sessionparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +sessionparser.o: ../../../winix/winixd/models/itemcontent.h config.h +sessionparser.o: ../../../winix/winixd/templates/htmltextstream.h +sessionparser.o: ../../../winix/winixd/core/textstream.h +sessionparser.o: ../../../pikotools/space/spacetojson.h +sessionparser.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h +sessionparser.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h +sessionparser.o: ../../../morm/src/morm.h ../../../morm/src/finder.h +sessionparser.o: ../../../morm/src/cursor.h sessionparser.o: ../../../morm/src/jsonexpression.h sessionparser.o: ../../../morm/src/postgresqlexpression.h sessionparser.o: ../../../morm/src/jsonconnector.h @@ -1240,7 +1281,6 @@ sessionparser.o: ../../../winix/winixd/db/dbconn.h sessionparser.o: ../../../winix/winixd/db/dbtextstream.h sessionparser.o: ../../../winix/winixd/core/error.h sessionparser.o: ../../../winix/winixd/db/dbitemquery.h -sessionparser.o: ../../../winix/winixd/core/item.h sessionparser.o: ../../../winix/winixd/db/dbitemcolumns.h sessionparser.o: ../../../winix/winixd/core/user.h sessionparser.o: ../../../winix/winixd/core/group.h @@ -1251,7 +1291,18 @@ slog.o: ../../../pikotools/textstream/textstream.h slog.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h slog.o: ../../../pikotools/convert/inttostr.h slog.o: ../../../pikotools/membuffer/membuffer.h -slog.o: ../../../pikotools/textstream/types.h item.h error.h config.h +slog.o: ../../../pikotools/textstream/types.h +slog.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +slog.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +slog.o: ../../../morm/src/dbconnector.h ../../../pikotools/log/log.h +slog.o: filelog.h ../../../winix/winixd/core/synchro.h +slog.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h +slog.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h +slog.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +slog.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +slog.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h +slog.o: ../../../morm/src/flatexpression.h +slog.o: ../../../winix/winixd/models/itemcontent.h error.h config.h slog.o: textstream.h misc.h ../../../pikotools/utf8/utf8.h winix_const.h slog.o: ../../../pikotools/convert/convert.h slog.o: ../../../pikotools/convert/inttostr.h @@ -1266,9 +1317,8 @@ slog.o: ../../../pikotools/textstream/types.h ../../../ezc/src/outstreams.h slog.o: session.h user.h plugindata.h rebus.h winixbase.h slog.o: ../../../winix/winixd/core/config.h slog.o: ../../../pikotools/space/spaceparser.h log.h logmanipulators.h -slog.o: ../../../pikotools/log/log.h filelog.h -slog.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h -slog.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h mount.h +slog.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h +slog.o: lock.h synchro.h ipban.h mount.h slog.o: ../../../winix/winixd/templates/locale.h slog.o: ../../../winix/winixd/core/winixbase.h slog.o: ../../../pikotools/convert/patternreplacer.h @@ -1288,10 +1338,10 @@ system.o: ../../../pikotools/textstream/types.h filelog.h system.o: ../../../winix/winixd/core/synchro.h system.o: ../../../winix/winixd/core/log.h system.o: ../../../winix/winixd/core/filelog.h lock.h -system.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -system.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -system.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -system.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h +system.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +system.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +system.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +system.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h system.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h system.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h system.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h @@ -1302,14 +1352,15 @@ system.o: ../../../morm/src/jsonexpression.h system.o: ../../../morm/src/postgresqlexpression.h system.o: ../../../morm/src/jsonconnector.h system.o: ../../../morm/src/postgresqlconnector.h -system.o: ../../../morm/src/postgresqlqueryresult.h dirs.h item.h -system.o: dircontainer.h ../../../winix/winixd/db/db.h -system.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h +system.o: ../../../morm/src/postgresqlqueryresult.h dirs.h dircontainer.h +system.o: ../../../winix/winixd/models/item.h +system.o: ../../../winix/winixd/models/itemcontent.h +system.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +system.o: ../../../winix/winixd/db/dbconn.h system.o: ../../../winix/winixd/db/dbtextstream.h system.o: ../../../winix/winixd/core/textstream.h system.o: ../../../winix/winixd/core/error.h system.o: ../../../winix/winixd/db/dbitemquery.h -system.o: ../../../winix/winixd/core/item.h system.o: ../../../winix/winixd/db/dbitemcolumns.h system.o: ../../../winix/winixd/core/user.h system.o: ../../../winix/winixd/core/group.h @@ -1334,10 +1385,10 @@ system.o: ../../../winix/winixd/templates/patterns.h system.o: ../../../winix/winixd/templates/locale.h system.o: ../../../winix/winixd/templates/localefilter.h system.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -system.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h -system.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -system.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -system.o: ../../../ezc/src/expressionparser.h +system.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +system.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h +system.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h +system.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h system.o: ../../../ezc/src/patternparser.h system.o: ../../../winix/winixd/notify/notifythread.h system.o: ../../../winix/winixd/core/basethread.h @@ -1418,11 +1469,11 @@ threadmanager.o: ../../../pikotools/textstream/types.h filelog.h threadmanager.o: ../../../winix/winixd/core/synchro.h threadmanager.o: ../../../winix/winixd/core/log.h threadmanager.o: ../../../winix/winixd/core/filelog.h lock.h -threadmanager.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -threadmanager.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h +threadmanager.o: ../../../morm/src/modelconnector.h threadmanager.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h threadmanager.o: ../../../morm/src/queryresult.h -threadmanager.o: ../../../morm/src/flatconnector.h +threadmanager.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +threadmanager.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h threadmanager.o: ../../../morm/src/dbexpression.h threadmanager.o: ../../../morm/src/baseexpression.h threadmanager.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h @@ -1439,7 +1490,7 @@ threadmanager.o: ../../../morm/src/postgresqlconnector.h threadmanager.o: ../../../morm/src/postgresqlqueryresult.h timezone.o: timezone.h ../../../pikotools/date/date.h timezone.o: ../../../pikotools/convert/inttostr.h -timezone.o: ../../../pikotools/space/space.h misc.h item.h requesttypes.h +timezone.o: ../../../pikotools/space/space.h misc.h requesttypes.h timezone.o: ../../../pikotools/textstream/textstream.h timezone.o: ../../../pikotools/membuffer/membuffer.h timezone.o: ../../../pikotools/textstream/types.h @@ -1463,8 +1514,8 @@ timezones.o: ../../../pikotools/textstream/types.h filelog.h timezones.o: ../../../winix/winixd/core/synchro.h timezones.o: ../../../winix/winixd/core/log.h timezones.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h -timezones.o: item.h requesttypes.h ../../../pikotools/utf8/utf8.h -timezones.o: winix_const.h ../../../pikotools/convert/convert.h +timezones.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h +timezones.o: ../../../pikotools/convert/convert.h timezones.o: ../../../pikotools/convert/inttostr.h timezones.o: ../../../pikotools/convert/patternreplacer.h timezones.o: ../../../pikotools/convert/strtoint.h @@ -1485,8 +1536,18 @@ users.o: ../../../pikotools/textstream/types.h filelog.h users.o: ../../../winix/winixd/core/synchro.h users.o: ../../../winix/winixd/core/log.h users.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h cur.h -users.o: request.h requesttypes.h item.h error.h config.h textstream.h misc.h -users.o: ../../../pikotools/utf8/utf8.h winix_const.h +users.o: request.h requesttypes.h ../../../winix/winixd/models/item.h +users.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h +users.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h +users.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h +users.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h +users.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +users.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +users.o: ../../../morm/src/finderhelper.h +users.o: ../../../morm/src/fieldvaluehelper.h +users.o: ../../../morm/src/flatexpression.h +users.o: ../../../winix/winixd/models/itemcontent.h error.h config.h +users.o: textstream.h misc.h ../../../pikotools/utf8/utf8.h winix_const.h users.o: ../../../pikotools/convert/convert.h users.o: ../../../pikotools/convert/inttostr.h users.o: ../../../pikotools/convert/patternreplacer.h @@ -1502,20 +1563,11 @@ users.o: ../../../winix/winixd/db/dbtextstream.h users.o: ../../../winix/winixd/core/winixbase.h users.o: ../../../winix/winixd/core/error.h users.o: ../../../winix/winixd/db/dbitemquery.h -users.o: ../../../winix/winixd/core/item.h users.o: ../../../winix/winixd/db/dbitemcolumns.h users.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h users.o: ../../../winix/winixd/core/dircontainer.h users.o: ../../../winix/winixd/core/ugcontainer.h winixmodel.h plugin.h -users.o: pluginmsg.h ../../../morm/src/morm.h ../../../morm/src/morm_types.h -users.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -users.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -users.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h -users.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h -users.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -users.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h -users.o: ../../../morm/src/fieldvaluehelper.h -users.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h +users.o: pluginmsg.h ../../../morm/src/morm.h ../../../morm/src/finder.h users.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h users.o: ../../../morm/src/postgresqlexpression.h users.o: ../../../morm/src/jsonconnector.h @@ -1532,10 +1584,11 @@ users.o: ../../../winix/winixd/templates/patterns.h users.o: ../../../winix/winixd/templates/locale.h users.o: ../../../winix/winixd/templates/localefilter.h users.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -users.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h -users.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -users.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -users.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h +users.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +users.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h +users.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h +users.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +users.o: ../../../ezc/src/patternparser.h users.o: ../../../winix/winixd/notify/notifythread.h users.o: ../../../winix/winixd/core/basethread.h users.o: ../../../winix/winixd/notify/templatesnotify.h @@ -1571,11 +1624,10 @@ winixmodel.o: ../../../pikotools/textstream/types.h filelog.h winixmodel.o: ../../../winix/winixd/core/synchro.h winixmodel.o: ../../../winix/winixd/core/log.h winixmodel.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h -winixmodel.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -winixmodel.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -winixmodel.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -winixmodel.o: ../../../morm/src/queryresult.h -winixmodel.o: ../../../morm/src/flatconnector.h +winixmodel.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +winixmodel.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +winixmodel.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +winixmodel.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h winixmodel.o: ../../../morm/src/dbexpression.h winixmodel.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h winixmodel.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h diff --git a/winixd/core/Makefile.o.dep b/winixd/core/Makefile.o.dep index 64eb005..cfd4020 100644 --- a/winixd/core/Makefile.o.dep +++ b/winixd/core/Makefile.o.dep @@ -1 +1 @@ -o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o crypt.o dircontainer.o dirs.o filelog.o groups.o htmlfilter.o httpsimpleparser.o image.o ipbancontainer.o item.o job.o lastcontainer.o loadavg.o lock.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionidmanager.o sessionmanager.o sessionparser.o slog.o synchro.o system.o threadmanager.o timezone.o timezones.o user.o users.o winixbase.o winixmodel.o winixrequest.o winixsystem.o \ No newline at end of file +o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o crypt.o dircontainer.o dirs.o filelog.o groups.o htmlfilter.o httpsimpleparser.o image.o ipbancontainer.o job.o lastcontainer.o loadavg.o lock.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionidmanager.o sessionmanager.o sessionparser.o slog.o synchro.o system.o threadmanager.o timezone.o timezones.o user.o users.o winixbase.o winixmodel.o winixrequest.o winixsystem.o \ No newline at end of file diff --git a/winixd/core/app.cpp b/winixd/core/app.cpp index d4d4cdd..d94f059 100644 --- a/winixd/core/app.cpp +++ b/winixd/core/app.cpp @@ -284,6 +284,14 @@ bool App::Init() model_connector.set_db_connector(postgresql_connector); //model_connector.set_doc_connector(doc_html_connector); + // temporary + Item item_temp; + item_temp.set_connector(model_connector); + item_temp.do_migration(&model_connector); + //std::exit(0); + // ----------- + + db_conn.SetConnParam(config.db_database, config.db_user, config.db_pass); db_conn.WaitForConnection(); db.PostgreSQLsmallerThan10(config.db_postgresql_smaller_than_10); diff --git a/winixd/core/dircontainer.h b/winixd/core/dircontainer.h index ebb7471..b1dcfe0 100644 --- a/winixd/core/dircontainer.h +++ b/winixd/core/dircontainer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,8 +37,8 @@ #include #include -#include "item.h" #include "winixbase.h" +#include "models/item.h" namespace Winix diff --git a/winixd/core/dirs.cpp b/winixd/core/dirs.cpp index 9299f9d..440a2dd 100644 --- a/winixd/core/dirs.cpp +++ b/winixd/core/dirs.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -76,7 +76,7 @@ void Dirs::Clear() bool Dirs::HasReadExecAccessForRoot(const Item & item) { // there must be at least one 'x' (for the root) - return (item.privileges & 01111) != 0; + return (item.item_content.privileges & 01111) != 0; } @@ -88,28 +88,33 @@ void Dirs::CheckRootDir() { if( !HasReadExecAccessForRoot(*i) ) { - i->privileges = 07555; + i->item_content.privileges = 07555; log << log1 << "Dirs: there is no access for a root (admin) to the root dir, setting 07555 for the root directory" << logend; - db->EditPrivById(*i, i->id); + i->update(false, false); + //db->EditPrivById(*i, i->id); } return; } - log << log1 << "Dirs: there is no a root directory in the database (creating one)" << logend; Item root; + root.set_connector(model_connector); root.type = Item::dir; root.parent_id = -1; - root.user_id = -1; - root.group_id = -1; - root.privileges = 07555; + root.item_content.user_id = -1; + root.item_content.group_id = -1; + root.item_content.privileges = 07555; // !! upewnic sie ze baza nie zmieni url (gdyby wczesniej juz byl w bazie pusty url) // !! zrobic jakis wyjatek do wprowadzania roota? - if( db->AddItem(root) == WINIX_ERR_OK ) +// if( db->AddItem(root) == WINIX_ERR_OK ) +// { +// dir_tab.PushBack(root); +// } + if( root.insert() ) { dir_tab.PushBack(root); } @@ -122,7 +127,15 @@ void Dirs::ReadDirs() { Clear(); - db->GetDirs(dir_tab); + //db->GetDirs(dir_tab); + morm::Finder finder(model_connector); + std::list all_dirs = finder.select().where().eq(L"type", static_cast(Item::Type::dir)).get_list(); + + for(Item & item : all_dirs) + { + dir_tab.PushBack(item); + } + CheckRootDir(); dir_tab.FindSpecialFolders(); } @@ -723,7 +736,7 @@ bool Dirs::DelDir(long dir_id) } -Error Dirs::AddDirectory(Item & item, bool add_to_dir_tab, Item ** pdir, int notify_code) +bool Dirs::AddDirectory(Item & item, bool add_to_dir_tab, Item ** pdir, int notify_code) { if( pdir ) *pdir = 0; @@ -731,9 +744,11 @@ Error Dirs::AddDirectory(Item & item, bool add_to_dir_tab, Item ** pdir, int not if( item.type != Item::dir ) return WINIX_ERR_DIR_EXPECTED; - Error status = db->AddItem(item); + //Error status = db->AddItem(item); + //item.set_connector(model_connector); + bool status = item.insert(); - if( status == WINIX_ERR_OK ) + if( status ) { Item * d = AddDir(item); @@ -764,10 +779,11 @@ Item * Dirs::CreateVarDir() if( root ) { + v.set_connector(root->get_connector()); v.parent_id = root->id; - v.user_id = root->user_id; - v.group_id = root->group_id; - v.privileges = root->privileges; + v.item_content.user_id = root->item_content.user_id; + v.item_content.group_id = root->item_content.group_id; + v.item_content.privileges = root->item_content.privileges; v.subject = L"var"; v.url = L"var"; v.type = Item::dir; diff --git a/winixd/core/dirs.h b/winixd/core/dirs.h index 7d1f3b1..4c4a514 100644 --- a/winixd/core/dirs.h +++ b/winixd/core/dirs.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,12 +39,11 @@ #include #include #include - -#include "item.h" #include "dircontainer.h" #include "db/db.h" #include "request.h" #include "winixmodel.h" +#include "models/item.h" @@ -115,7 +114,7 @@ public: Item * CreateVarDir(); // !! jak juz wczesniejsze nazwy beda zmienione to tutaj damy AddDir() /AddDir() juz istnieje przeciez?/ - Error AddDirectory(Item & item, bool add_to_dir_tab = false, Item ** pdir = 0, int notify_code = 0); + bool AddDirectory(Item & item, bool add_to_dir_tab = false, Item ** pdir = 0, int notify_code = 0); // returns how many levels of directories there are // "/" -> 0 (root dir) diff --git a/winixd/core/image.cpp b/winixd/core/image.cpp index bed1183..0e191d1 100644 --- a/winixd/core/image.cpp +++ b/winixd/core/image.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -377,7 +377,7 @@ bool Image::CreateInputFileName() { bool thumb = (item_work.type == WINIX_IMAGE_TYPE_CROP_THUMB); - if( thumb && !file_work.has_thumb ) + if( thumb && !file_work.item_content.file_has_thumb ) { log << log1 << "Image: file id: " << file_work.id << ", url: " << file_work.url << " doesn't have a thumbnail yet (skipping)" << logend; @@ -414,11 +414,19 @@ bool Image::CreateCommand() { class Lock lock_object(synchro); - iq.SetAll(true, false); - iq.WhereId(item_work.file_id); +// iq.SetAll(true, false); +// iq.WhereId(item_work.file_id); + + morm::Finder finder(model_connector); + + { + // IMPROVEME we need a seperate model_connector for this thread + Lock(); + file_work = finder.select().where().eq(L"id", item_work.file_id).get(); + } // the file could have been changed especially when there is a long queue of files - if( db->GetItem(file_work, iq) != WINIX_ERR_OK ) + if( !file_work.found() ) return false; if( !CreateInputFileName() ) @@ -483,10 +491,16 @@ void Image::ImageSavedCorrectly() { if( item_work.type == WINIX_IMAGE_TYPE_CREATE_THUMB ) { - if( !file_work.has_thumb ) + if( !file_work.item_content.file_has_thumb ) { - file_work.has_thumb = true; - db->EditHasThumbById(true, file_work.id); + file_work.item_content.file_has_thumb = true; + + { + // IMPROVEME we need a separate model_connector for this thread + Lock(); + file_work.update(false, false); + //db->EditHasThumbById(true, file_work.id); + } } log << log3 << "Image: generated a thumbnail: " << dst_path << logend; @@ -528,11 +542,23 @@ void Image::SaveImage() class Lock lock_object(synchro); // the file could have been changed especially when creating the image lasted too long - iq.SetAll(true, false); - iq.WhereId(item_work.file_id); + //iq.SetAll(true, false); + //iq.WhereId(item_work.file_id); + + morm::Finder finder(model_connector); - if( db->GetItem(file_work, iq) == WINIX_ERR_OK ) { + // IMPROVEME we need a seperate model_connector for this thread + Lock(); + file_work = finder.select().where().eq(L"id", item_work.file_id).get(); + } + + // the file could have been changed especially when there is a long queue of files + if( !file_work.found() ) + return; + + //if( db->GetItem(file_work, iq) == WINIX_ERR_OK ) + //{ bool thumb = (item_work.type == WINIX_IMAGE_TYPE_CREATE_THUMB || item_work.type == WINIX_IMAGE_TYPE_CROP_THUMB || item_work.type == WINIX_IMAGE_TYPE_CREATE_CROP_NEW_THUMB ); @@ -558,7 +584,7 @@ void Image::SaveImage() { log << log1 << "Image: cannot create a destination path" << logend; } - } + //} } diff --git a/winixd/core/image.h b/winixd/core/image.h index 3ad93c0..6e0f206 100644 --- a/winixd/core/image.h +++ b/winixd/core/image.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,8 +40,8 @@ #include "basethread.h" #include "textstream.h" #include "db/db.h" -#include "core/item.h" #include "core/config.h" +#include "models/item.h" namespace Winix @@ -187,7 +187,6 @@ private: std::wstring src_path, dst_path; TextStream command; TextStream stream_tmp_path; - DbItemQuery iq; std::string add_tempa; std::string input_file_name; std::string tmp_file_name; diff --git a/winixd/core/item.h b/winixd/core/item.h deleted file mode 100644 index 9be1670..0000000 --- a/winixd/core/item.h +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is a part of Winix - * and is distributed under the 2-Clause BSD licence. - * Author: Tomasz Sowa - */ - -/* - * Copyright (c) 2008-2016, 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_core_item -#define headerfile_winix_core_item - -#include -#include "space/space.h" -#include "date/date.h" - - -namespace Winix -{ - - -#define WINIX_ITEM_FILETYPE_NONE 0 -#define WINIX_ITEM_FILETYPE_IMAGE 1 -#define WINIX_ITEM_FILETYPE_DOCUMENT 2 -#define WINIX_ITEM_FILETYPE_VIDEO 3 -#define WINIX_ITEM_FILETYPE_UNKNOWN 10 - - - - -struct Item -{ - long id; - long parent_id; - - - long user_id; - long group_id; - std::wstring guest_name; // used as a user name when user_id is equal -1 - - long modification_user_id; // who has modified the item last (not taken into account when checking permissions) - - int privileges; - - PT::Date date_creation; - PT::Date date_modification; - - std::wstring subject; - std::wstring content; - - std::wstring url; - int modify_index; - - enum ContentType - { - ct_text = 0, - ct_formatted_text, - ct_html, - ct_bbcode, - ct_other, // no auto-formatting is applied - }; - - ContentType content_type; - - - - enum Type - { - dir = 0, - file = 1, - symlink = 2, - - none = 1000 - }; - - - Type type; - - - // used when type is symlink or to a directory too (function 'default') - std::wstring link_to; - int link_redirect; // !! IMPROVE ME should it be 'bool'? - - - // static file (if exists) - std::wstring file_path; // relative file path - int file_fs; // file system type where the file was saved - int file_type; // file type (none, image, doc, etc) - bool has_thumb; // whether or not we have a thumbnail - std::wstring hash; // file hash (md4, md5, ...) - int hash_type; // hash type WINIX_CRYPT_HASH_* (see crypt.h) - size_t file_size; // size of the file - - std::wstring html_template; - - - // sort index used when displaying a group of items - int sort_index; - - - // meta information - PT::Space meta; - PT::Space ameta; - - - // methods - Item(); - void SetDateToNow(); - void SetDateModifyToNow(); - void Clear(); - - - static bool CanContentBeHtmlFiltered(Item::ContentType ct); - bool CanContentBeHtmlFiltered(); - - -private: - // used by the database - long content_id; // content id in 'content' table - int ref; // content references - -friend class Db; -friend struct DbItemColumns; -}; - - -} // namespace Winix - - - -#endif diff --git a/winixd/core/misc.h b/winixd/core/misc.h index 6a2f894..f5a9e6f 100644 --- a/winixd/core/misc.h +++ b/winixd/core/misc.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include #include #include -#include "item.h" #include "requesttypes.h" #include "date/date.h" #include "textstream/textstream.h" diff --git a/winixd/core/mountparser.h b/winixd/core/mountparser.h index 8441628..3620931 100644 --- a/winixd/core/mountparser.h +++ b/winixd/core/mountparser.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,11 +40,10 @@ #include #include #include - #include "mount.h" -#include "item.h" #include "dirs.h" #include "winixmodel.h" +#include "models/item.h" diff --git a/winixd/core/mounts.cpp b/winixd/core/mounts.cpp index f24be67..71f5ccb 100644 --- a/winixd/core/mounts.cpp +++ b/winixd/core/mounts.cpp @@ -233,7 +233,7 @@ void Mounts::ReadMounts(const std::wstring & mounts) // reading from /etc/fstab -Error Mounts::ReadMounts() +void Mounts::ReadMounts() { static std::wstring file = L"fstab"; @@ -242,27 +242,27 @@ Error Mounts::ReadMounts() if( !etc ) { log << log1 << "M: there is no /etc directory" << logend; - return WINIX_ERR_NO_ITEM; + return; } - Item fstab; - Error err = db->GetItem(etc->id, file, fstab); + morm::Finder finder(model_connector); + Item fstab = finder.select().where().eq(L"parent_id", etc->id).eq(L"url", file).get(); - if( err == WINIX_ERR_NO_ITEM ) +// Error err = db->GetItem(etc->id, file, fstab); + + if( !fstab.found() ) { log << log1 << "M: there is no /etc/fstab file" << logend; - return err; + return; } - if( err != WINIX_ERR_OK ) - { - log << log1 << "M: cannot read /etc/fstab" << logend; - return err; - } +// if( err != WINIX_ERR_OK ) +// { +// log << log1 << "M: cannot read /etc/fstab" << logend; +// return err; +// } - ReadMounts(fstab.content); - -return WINIX_ERR_OK; + ReadMounts(fstab.item_content.content_raw); } diff --git a/winixd/core/mounts.h b/winixd/core/mounts.h index c570781..c496f39 100644 --- a/winixd/core/mounts.h +++ b/winixd/core/mounts.h @@ -124,7 +124,7 @@ public: void CreateMounts(); void ReadMounts(const std::wstring & mounts); - Error ReadMounts(); + void ReadMounts(); Mount * CalcCurMount(); Mount * CalcMount(long dir_id); diff --git a/winixd/core/plugin.cpp b/winixd/core/plugin.cpp index f8cd193..2b6f720 100644 --- a/winixd/core/plugin.cpp +++ b/winixd/core/plugin.cpp @@ -69,6 +69,9 @@ void PluginInfo::set_dependency_for(WinixBase & winix_base) void PluginInfo::set_dependency_for(WinixModel * winix_model) { plugin->SetDependencyFor(winix_model); + + //model_connector = winix_model->get_model_connector(); + // CHECKME what about model_connector here? } void PluginInfo::set_dependency_for(WinixModel & winix_model) diff --git a/winixd/core/plugin.h b/winixd/core/plugin.h index 58da6eb..f9fded3 100644 --- a/winixd/core/plugin.h +++ b/winixd/core/plugin.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ #include "pluginmsg.h" #include "plugindata.h" #include "winixbase.h" - +#include "modelconnector.h" @@ -81,6 +81,7 @@ struct Session; // move me to a different file +// may it should be based on WinixModel? struct PluginInfo { // these variables are used for some purposes @@ -108,6 +109,7 @@ struct PluginInfo Plugin * plugin; + morm::ModelConnector * model_connector; // a session // some messages are sent in a session's context e.g. logging a user diff --git a/winixd/core/request.h b/winixd/core/request.h index d46bcb8..65ac7a5 100644 --- a/winixd/core/request.h +++ b/winixd/core/request.h @@ -39,7 +39,7 @@ #include #include #include "requesttypes.h" -#include "item.h" +#include "models/item.h" #include "error.h" #include "config.h" #include "textstream.h" diff --git a/winixd/core/session.h b/winixd/core/session.h index 177ad2f..8a5fd06 100644 --- a/winixd/core/session.h +++ b/winixd/core/session.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include #include #include -#include "item.h" #include "error.h" #include "user.h" #include "plugindata.h" diff --git a/winixd/core/system.cpp b/winixd/core/system.cpp index 75d35e2..5ca4a0d 100644 --- a/winixd/core/system.cpp +++ b/winixd/core/system.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -337,14 +337,23 @@ void System::RedirectTo(long item_id, const wchar_t * postfix, bool use_reqtype) else { // item_id is pointing to a file - DbItemQuery iq; +// DbItemQuery iq; - iq.SetAllSel(false); - iq.WhereId(item_id); - iq.sel_parent_id = true; - iq.sel_url = true; +// iq.SetAllSel(false); +// iq.WhereId(item_id); +// iq.sel_parent_id = true; +// iq.sel_url = true; - if( db->GetItem(item_temp, iq) == WINIX_ERR_OK ) + morm::Finder finder(model_connector); + + item_temp = finder. + select(). + where(). + eq(L"id", item_id). + get(); + + //if( db->GetItem(item_temp, iq) == WINIX_ERR_OK ) + if( item_temp.found() ) { if( dirs.MakePath(item_temp.parent_id, cur->request->redirect_to, false) ) cur->request->redirect_to += item_temp.url; @@ -528,7 +537,7 @@ bool System::CanChangeUser(const Item & item, long new_user_id) // super user is allowed everything return true; - if( item.user_id == -1 || new_user_id == -1 || item.user_id != new_user_id ) + if( item.item_content.user_id == -1 || new_user_id == -1 || item.item_content.user_id != new_user_id ) // only super user can change the owner of an item return false; @@ -548,7 +557,7 @@ bool System::CanChangeGroup(const Item & item, long new_group_id) // super user is allowed everything return true; - if( item.group_id != new_group_id ) + if( item.item_content.group_id != new_group_id ) { // user is allowed to change the group only if he is an owner of the item // he can change only into a group in which he is a member of, or into a 'no_group' @@ -556,7 +565,7 @@ bool System::CanChangeGroup(const Item & item, long new_group_id) if( !cur->session->puser || cur->session->puser->id == -1 ) return false; - if( item.user_id == -1 || cur->session->puser->id != item.user_id ) + if( item.item_content.user_id == -1 || cur->session->puser->id != item.item_content.user_id ) return false; if( new_group_id == -1 ) @@ -582,14 +591,14 @@ bool System::CanChangePrivileges(const Item & item, int new_priv) // super user is allowed everything return true; - if( item.privileges != new_priv ) + if( item.item_content.privileges != new_priv ) { // the owner of an item is allowed to change the privileges if( !cur->session->puser || cur->session->puser->id == -1 ) return false; - if( item.user_id == -1 || cur->session->puser->id != item.user_id ) + if( item.item_content.user_id == -1 || cur->session->puser->id != item.item_content.user_id ) return false; } @@ -608,27 +617,27 @@ bool System::HasAccess(const Item & item, int mask) // super user is allowed everything return true; - if( cur->session->puser && item.user_id != -1 && cur->session->puser->id == item.user_id ) + if( cur->session->puser && item.item_content.user_id != -1 && cur->session->puser->id == item.item_content.user_id ) { // the owner - return ((item.privileges >> 9) & mask) == mask; + return ((item.item_content.privileges >> 9) & mask) == mask; } - if( cur->session->puser && item.group_id != -1 && cur->session->puser->IsMemberOf(item.group_id) ) + if( cur->session->puser && item.item_content.group_id != -1 && cur->session->puser->IsMemberOf(item.item_content.group_id) ) { // group - return ((item.privileges >> 6) & mask) == mask; + return ((item.item_content.privileges >> 6) & mask) == mask; } if( cur->session->puser ) { // others -- others logged people - return ((item.privileges >> 3) & mask) == mask; + return ((item.item_content.privileges >> 3) & mask) == mask; } // guests -- not logged people -return (item.privileges & mask) == mask; +return (item.item_content.privileges & mask) == mask; } @@ -656,7 +665,7 @@ bool System::HasReadExecAccess(const Item & item) { // there must be at least one 'x' (for the root) // !! CHECK ME: is it applicable to directories too? - return (item.privileges & 01111) != 0; + return (item.item_content.privileges & 01111) != 0; } return HasAccess(item, 5); // r+x @@ -774,7 +783,7 @@ bool System::CanRemoveRenameChild(const Item & dir, long child_item_user_id) if( !HasWriteAccess(dir) ) return false; - if( (dir.privileges & 010000) == 0 ) + if( (dir.item_content.privileges & 010000) == 0 ) // there is no a sticky bit set to this directory return true; @@ -783,10 +792,10 @@ bool System::CanRemoveRenameChild(const Item & dir, long child_item_user_id) if( cur->session->puser->super_user ) return true; - if( dir.user_id != -1 && cur->session->puser->id != -1 && child_item_user_id != -1 ) + if( dir.item_content.user_id != -1 && cur->session->puser->id != -1 && child_item_user_id != -1 ) { if( cur->session->puser->id == child_item_user_id || - cur->session->puser->id == dir.user_id ) + cur->session->puser->id == dir.item_content.user_id ) return true; } } @@ -867,12 +876,12 @@ return puser->IsMemberOf(group); // the path depends on parent_id bool System::CreateNewFileSimpleFs(Item & item) { - bool res = dirs.MakePath(item.parent_id, item.file_path); + bool res = dirs.MakePath(item.parent_id, item.item_content.file_path); if( res ) { - if( !item.file_path.empty() && item.file_path[0] == '/' ) - item.file_path.erase(0, 1); + if( !item.item_content.file_path.empty() && item.item_content.file_path[0] == '/' ) + item.item_content.file_path.erase(0, 1); } else { @@ -897,7 +906,7 @@ size_t buffer_len = sizeof(buffer)/sizeof(wchar_t); buffer[0] = '0'; swprintf(buffer+1, buffer_len, L"%lx", (unsigned long)item.id); - item.file_path.clear(); + item.item_content.file_path.clear(); // make sure that the length is even if( (wcslen(hash) & 1) != 0 ) @@ -905,16 +914,16 @@ size_t buffer_len = sizeof(buffer)/sizeof(wchar_t); for(size_t i=0 ; hash[i] != 0 ; i+=2) { - item.file_path += hash[i]; - item.file_path += hash[i+1]; + item.item_content.file_path += hash[i]; + item.item_content.file_path += hash[i+1]; if( hash[i+2] != 0 ) - item.file_path += '/'; + item.item_content.file_path += '/'; } // one character more to make sure the path is unique // (we can have a directory without the character) - item.file_path += '_'; + item.item_content.file_path += '_'; return true; } @@ -939,18 +948,18 @@ bool res; if( !pmount || pmount->fs != mounts.MountFsHashfs() ) { res = CreateNewFileSimpleFs(item); - item.file_fs = mounts.MountFsSimplefs(); + item.item_content.file_fs = mounts.MountFsSimplefs(); } else { res = CreateNewFileHashFs(item); - item.file_fs = mounts.MountFsHashfs(); + item.item_content.file_fs = mounts.MountFsHashfs(); } if( res ) - item.file_path += item.url; + item.item_content.file_path += item.url; else - item.file_path.clear(); + item.item_content.file_path.clear(); return res; } @@ -968,7 +977,7 @@ bool System::MakeFilePath(const Item & item, std::wstring & path, bool thumb, bo return false; } - if( item.file_path.empty() || item.file_type == WINIX_ITEM_FILETYPE_NONE ) + if( item.item_content.file_path.empty() || item.item_content.file_type == WINIX_ITEM_FILETYPE_NONE ) { log << log1 << "System: MakePath: this item has not a static file" << logend; return false; @@ -976,7 +985,7 @@ bool System::MakeFilePath(const Item & item, std::wstring & path, bool thumb, bo path = config->upload_dir; - if( item.file_fs == mounts.MountFsHashfs() ) + if( item.item_content.file_fs == mounts.MountFsHashfs() ) path += L"/hashfs"; else path += L"/simplefs"; @@ -988,11 +997,11 @@ bool System::MakeFilePath(const Item & item, std::wstring & path, bool thumb, bo path += L"/normal"; - if( create_dir && !CreateDirs(path, item.file_path, chmod, group, true) ) + if( create_dir && !CreateDirs(path, item.item_content.file_path, chmod, group, true) ) return false; path += '/'; - path += item.file_path; + path += item.item_content.file_path; return true; } @@ -1025,14 +1034,16 @@ return res; -Error System::AddFile(Item & item, int notify_code, bool call_plugins) +bool System::AddFile(Item & item, int notify_code, bool call_plugins) { if( item.type != Item::file ) return WINIX_ERR_FILE_EXPECTED; - Error status = db->AddItem(item); + + //Error status = db->AddItem(item); + bool status = item.insert(); - if( status == WINIX_ERR_OK ) + if( status ) { log << log2 << "System: added a new file, url: " << item.url << ", id: " << item.id << ", parent_id: " << item.parent_id << logend; @@ -1050,20 +1061,22 @@ return status; -Error System::EditFile(Item & item, bool with_url, int notify_code, bool call_plugins) +bool System::EditFile(Item & item, bool with_url, int notify_code, bool call_plugins) { if( item.type != Item::file ) return WINIX_ERR_FILE_EXPECTED; if( cur->session && cur->session->puser ) - cur->request->item.modification_user_id = cur->session->puser->id; + cur->request->item.item_content.modification_user_id = cur->session->puser->id; else - cur->request->item.modification_user_id = -1; + cur->request->item.item_content.modification_user_id = -1; - item.SetDateModifyToNow(); - Error status = db->EditItemById(item, with_url); + item.item_content.SetDateModifyToNow(); + + bool status = item.update(with_url, true); + //Error status = db->EditItemById(item, with_url); - if( status == WINIX_ERR_OK ) + if( status ) { TemplatesFunctions::pattern_cacher.UpdatePattern(item); @@ -1184,7 +1197,17 @@ int System::FollowLink(const std::vector & current_dir_tab, const std::ws if( res == 1 ) { - if( db->GetItem(out_dir_tab.back()->id, name_temp, out_item) == WINIX_ERR_OK ) + morm::Finder finder(model_connector); + + bool status = finder. + select(). + where(). + eq(L"parent_id", out_dir_tab.back()->id). + eq(L"url", name_temp). + get(out_item); + + //if( db->GetItem(out_dir_tab.back()->id, name_temp, out_item) == WINIX_ERR_OK ) + if( status ) return 1; else return 2; @@ -1213,12 +1236,12 @@ bool System::FollowAllLinksDirFound(std::vector & out_dir_tab, return false; } - if( !out_dir_tab.back()->link_to.empty() ) + if( !out_dir_tab.back()->item_content.link_to.empty() ) { if( follow_dir_default ) { - if( !(stop_on_link_redirect && out_dir_tab.back()->link_redirect==1) ) - link_to_temp = out_dir_tab.back()->link_to; + if( !(stop_on_link_redirect && out_dir_tab.back()->item_content.link_redirect==1) ) + link_to_temp = out_dir_tab.back()->item_content.link_to; } } @@ -1252,15 +1275,15 @@ bool System::FollowAllLinksFileOrSymlinkFound(std::vector & out_dir_tab, if( out_item.type == Item::symlink ) { - if( out_item.link_to.empty() ) + if( out_item.item_content.link_to.empty() ) { log << log1 << "System: symlink empty" << logend; return false; } else { - if( !(stop_on_link_redirect && out_item.link_redirect==1) ) - link_to_temp = out_item.link_to; + if( !(stop_on_link_redirect && out_item.item_content.link_redirect==1) ) + link_to_temp = out_item.item_content.link_to; } } @@ -1392,8 +1415,8 @@ bool System::FollowAllLinks(const std::wstring & link_to, cur->request->item.Clear(); cur->request->last_item = cur->request->dir_tab.back(); - if( !cur->request->dir_tab.back()->link_to.empty() ) - RedirectTo(cur->request->dir_tab.back()->link_to); + if( !cur->request->dir_tab.back()->item_content.link_to.empty() ) + RedirectTo(cur->request->dir_tab.back()->item_content.link_to); log << log3 << "System: current directory changed" << logend; } @@ -1404,7 +1427,7 @@ bool System::FollowAllLinks(const std::wstring & link_to, cur->request->last_item = &cur->request->item; if( cur->request->item.type == Item::symlink ) - RedirectTo(cur->request->item.link_to); // cur->request->item.link_to is not empty + RedirectTo(cur->request->item.item_content.link_to); // cur->request->item.item_content.link_to is not empty log << log3 << "System: current directory changed and the new file loaded" << logend; } @@ -1459,25 +1482,35 @@ bool System::AddCommonFileToVar(const wchar_t * file_path, const wchar_t * url, return false; } - if( db->GetItem(var->id, url, file_content_item) == WINIX_ERR_OK ) + morm::Finder finder(model_connector); + + bool status = finder.select().where().eq(L"parent_id", var->id).eq(L"url", url).get(file_content_item); + + //if( db->GetItem(var->id, url, file_content_item) == WINIX_ERR_OK ) + if( status ) { if( overwrite_existing ) - db->DelItem(file_content_item); + { + file_content_item.remove(); + //db->DelItem(file_content_item); + } else + { return true; + } } file_content_item.Clear(); file_content_item.parent_id = var->id; - file_content_item.user_id = var->user_id; - file_content_item.group_id = var->group_id; - file_content_item.privileges = 07555; // !! IMPROVE ME: may it should be added as a parameter to this function? + file_content_item.item_content.user_id = var->item_content.user_id; + file_content_item.item_content.group_id = var->item_content.group_id; + file_content_item.item_content.privileges = 07555; // !! IMPROVE ME: may it should be added as a parameter to this function? file_content_item.subject = url; file_content_item.url = url; file_content_item.type = Item::file; file_content_item.html_template = config->templates_index_raw; - file_content_item.content = file_content; - file_content_item.content_type = Item::ct_other; + file_content_item.item_content.content_raw = file_content; + file_content_item.item_content.content_raw_type = ItemContent::ct_other; return AddFile(file_content_item, false) == WINIX_ERR_OK; } diff --git a/winixd/core/system.h b/winixd/core/system.h index 6a5ef2f..2fa0cc4 100644 --- a/winixd/core/system.h +++ b/winixd/core/system.h @@ -178,8 +178,8 @@ public: bool MakePath(const Item & item, std::wstring & path, bool clear_path = true); - Error AddFile(Item & item, int notify_code = 0, bool call_plugins = true); - Error EditFile(Item & item, bool with_url = true, int notify_code = 0, bool call_plugins = true); + bool AddFile(Item & item, int notify_code = 0, bool call_plugins = true); + bool EditFile(Item & item, bool with_url = true, int notify_code = 0, bool call_plugins = true); time_t ToLocal(time_t utc_time); diff --git a/winixd/core/winixmodel.cpp b/winixd/core/winixmodel.cpp index c16e9f9..e9b0313 100644 --- a/winixd/core/winixmodel.cpp +++ b/winixd/core/winixmodel.cpp @@ -65,6 +65,12 @@ void WinixModel::set_model_connector(morm::ModelConnector * model_connector) } +morm::ModelConnector * WinixModel::get_model_connector() +{ + return model_connector; +} + + void WinixModel::set_dependency(WinixBase * winix_base) { WinixBase::set_dependency(winix_base); diff --git a/winixd/core/winixmodel.h b/winixd/core/winixmodel.h index a6387ac..25d4439 100644 --- a/winixd/core/winixmodel.h +++ b/winixd/core/winixmodel.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2018, Tomasz Sowa + * Copyright (c) 2018-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -52,6 +52,8 @@ public: virtual ~WinixModel(); void set_model_connector(morm::ModelConnector * model_connector); + morm::ModelConnector * get_model_connector(); + void set_plugin(Plugin * plugin); void set_dependency(WinixBase * winix_base); diff --git a/winixd/db/Makefile.dep b/winixd/db/Makefile.dep index 2ea42d9..26dc838 100644 --- a/winixd/db/Makefile.dep +++ b/winixd/db/Makefile.dep @@ -2,11 +2,11 @@ db.o: db.h dbbase.h dbconn.h dbtextstream.h db.o: ../../../winix/winixd/core/textstream.h -db.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h -db.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -db.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h +db.o: ../../../winix/winixd/core/misc.h db.o: ../../../winix/winixd/core/requesttypes.h db.o: ../../../pikotools/textstream/textstream.h +db.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +db.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h db.o: ../../../pikotools/membuffer/membuffer.h db.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h db.o: ../../../winix/winixd/core/winix_const.h @@ -23,21 +23,30 @@ db.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h db.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h db.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h db.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/error.h -db.o: dbitemquery.h ../../../winix/winixd/core/item.h dbitemcolumns.h -db.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h +db.o: dbitemquery.h dbitemcolumns.h ../../../winix/winixd/core/user.h +db.o: ../../../winix/winixd/core/group.h db.o: ../../../winix/winixd/core/dircontainer.h db.o: ../../../winix/winixd/core/winixbase.h +db.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +db.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +db.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +db.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +db.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +db.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +db.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +db.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/flatexpression.h +db.o: ../../../winix/winixd/models/itemcontent.h db.o: ../../../winix/winixd/core/ugcontainer.h db.o: ../../../winix/winixd/core/misc.h dbbase.o: dbbase.h dbconn.h dbtextstream.h dbbase.o: ../../../winix/winixd/core/textstream.h -dbbase.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +dbbase.o: ../../../winix/winixd/core/misc.h +dbbase.o: ../../../winix/winixd/core/requesttypes.h +dbbase.o: ../../../pikotools/textstream/textstream.h dbbase.o: ../../../pikotools/space/space.h dbbase.o: ../../../pikotools/textstream/types.h dbbase.o: ../../../pikotools/date/date.h dbbase.o: ../../../pikotools/convert/inttostr.h -dbbase.o: ../../../winix/winixd/core/requesttypes.h -dbbase.o: ../../../pikotools/textstream/textstream.h dbbase.o: ../../../pikotools/membuffer/membuffer.h dbbase.o: ../../../pikotools/textstream/types.h dbbase.o: ../../../pikotools/utf8/utf8.h @@ -61,13 +70,13 @@ dbbase.o: ../../../winix/winixd/core/synchro.h dbbase.o: ../../../winix/winixd/core/error.h dbbase.o: ../../../winix/winixd/core/misc.h dbconn.o: dbconn.h dbtextstream.h ../../../winix/winixd/core/textstream.h -dbconn.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +dbconn.o: ../../../winix/winixd/core/misc.h +dbconn.o: ../../../winix/winixd/core/requesttypes.h +dbconn.o: ../../../pikotools/textstream/textstream.h dbconn.o: ../../../pikotools/space/space.h dbconn.o: ../../../pikotools/textstream/types.h dbconn.o: ../../../pikotools/date/date.h dbconn.o: ../../../pikotools/convert/inttostr.h -dbconn.o: ../../../winix/winixd/core/requesttypes.h -dbconn.o: ../../../pikotools/textstream/textstream.h dbconn.o: ../../../pikotools/membuffer/membuffer.h dbconn.o: ../../../pikotools/textstream/types.h dbconn.o: ../../../pikotools/utf8/utf8.h @@ -89,17 +98,15 @@ dbconn.o: ../../../winix/winixd/core/filelog.h dbconn.o: ../../../winix/winixd/core/lock.h dbconn.o: ../../../winix/winixd/core/synchro.h dbconn.o: ../../../winix/winixd/core/error.h -dbitemcolumns.o: dbitemcolumns.h ../../../winix/winixd/core/item.h dbbase.h -dbitemcolumns.o: dbconn.h dbtextstream.h +dbitemcolumns.o: dbitemcolumns.h dbbase.h dbconn.h dbtextstream.h dbitemcolumns.o: ../../../winix/winixd/core/textstream.h dbitemcolumns.o: ../../../winix/winixd/core/misc.h -dbitemcolumns.o: ../../../winix/winixd/core/item.h +dbitemcolumns.o: ../../../winix/winixd/core/requesttypes.h +dbitemcolumns.o: ../../../pikotools/textstream/textstream.h dbitemcolumns.o: ../../../pikotools/space/space.h dbitemcolumns.o: ../../../pikotools/textstream/types.h dbitemcolumns.o: ../../../pikotools/date/date.h dbitemcolumns.o: ../../../pikotools/convert/inttostr.h -dbitemcolumns.o: ../../../winix/winixd/core/requesttypes.h -dbitemcolumns.o: ../../../pikotools/textstream/textstream.h dbitemcolumns.o: ../../../pikotools/membuffer/membuffer.h dbitemcolumns.o: ../../../pikotools/textstream/types.h dbitemcolumns.o: ../../../pikotools/utf8/utf8.h @@ -123,16 +130,15 @@ dbitemcolumns.o: ../../../winix/winixd/core/filelog.h dbitemcolumns.o: ../../../winix/winixd/core/lock.h dbitemcolumns.o: ../../../winix/winixd/core/synchro.h dbitemcolumns.o: ../../../winix/winixd/core/error.h -dbitemquery.o: dbitemquery.h ../../../winix/winixd/core/item.h +dbitemquery.o: dbitemquery.h dbtextstream.o: dbtextstream.h ../../../winix/winixd/core/textstream.h dbtextstream.o: ../../../winix/winixd/core/misc.h -dbtextstream.o: ../../../winix/winixd/core/item.h +dbtextstream.o: ../../../winix/winixd/core/requesttypes.h +dbtextstream.o: ../../../pikotools/textstream/textstream.h dbtextstream.o: ../../../pikotools/space/space.h dbtextstream.o: ../../../pikotools/textstream/types.h dbtextstream.o: ../../../pikotools/date/date.h dbtextstream.o: ../../../pikotools/convert/inttostr.h -dbtextstream.o: ../../../winix/winixd/core/requesttypes.h -dbtextstream.o: ../../../pikotools/textstream/textstream.h dbtextstream.o: ../../../pikotools/membuffer/membuffer.h dbtextstream.o: ../../../pikotools/textstream/types.h dbtextstream.o: ../../../pikotools/utf8/utf8.h diff --git a/winixd/db/db.cpp b/winixd/db/db.cpp index 6e7ead3..2814e5e 100644 --- a/winixd/db/db.cpp +++ b/winixd/db/db.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2017, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -281,1384 +281,1384 @@ return DoCommand(query); //!! wywalic z nazwy 'Subject' nic nie jest robione z tytulem // ta metoda uzywana tez jest w EditParentUrlById() -bool Db::AddItemCreateUrlSubject(Item & item) -{ -bool is_that_url; -PGresult * r = 0; -int index = 1; -const int max_index = 99; -wchar_t appendix[20]; -size_t appendix_len = sizeof(appendix) / sizeof(wchar_t); -appendix[0] = 0; - - // only root dir may not have url - if( item.parent_id != -1 && item.url.empty() ) - item.url = L"empty"; - - try - { - do - { - query_create_url.Clear(); - - temp_url = item.url; - temp_url += appendix; - - query_create_url - << R("select id from core.item where url=") - << temp_url - << R(" and parent_id=") - << item.parent_id - << R(";"); - - r = AssertQuery(query_create_url); - AssertResult(r, PGRES_TUPLES_OK); - - if( Rows(r) != 0 ) - { - swprintf(appendix, appendix_len, L"_(%d)", ++index); - is_that_url = true; - } - else - { - item.url = temp_url; - is_that_url = false; - } - - ClearResult(r); - r = 0; - } - while( is_that_url && index <= max_index ); - } - catch(const Error &) - { - is_that_url = true; // for returning false - } - - ClearResult(r); - -return !is_that_url; -} +//bool Db::AddItemCreateUrlSubject(Item & item) +//{ +//bool is_that_url; +//PGresult * r = 0; +//int index = 1; +//const int max_index = 99; +//wchar_t appendix[20]; +//size_t appendix_len = sizeof(appendix) / sizeof(wchar_t); +//appendix[0] = 0; +// +// // only root dir may not have url +// if( item.parent_id != -1 && item.url.empty() ) +// item.url = L"empty"; +// +// try +// { +// do +// { +// query_create_url.Clear(); +// +// temp_url = item.url; +// temp_url += appendix; +// +// query_create_url +// << R("select id from core.item where url=") +// << temp_url +// << R(" and parent_id=") +// << item.parent_id +// << R(";"); +// +// r = AssertQuery(query_create_url); +// AssertResult(r, PGRES_TUPLES_OK); +// +// if( Rows(r) != 0 ) +// { +// swprintf(appendix, appendix_len, L"_(%d)", ++index); +// is_that_url = true; +// } +// else +// { +// item.url = temp_url; +// is_that_url = false; +// } +// +// ClearResult(r); +// r = 0; +// } +// while( is_that_url && index <= max_index ); +// } +// catch(const Error &) +// { +// is_that_url = true; // for returning false +// } +// +// ClearResult(r); +// +//return !is_that_url; +//} -Error Db::AddItemIntoItem(Item & item) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - bool url_without_id = false; - - try - { - query.Clear(); - query << R("insert into core.item (user_id, modification_user_id, group_id, privileges, " - "date_creation, date_modification, type, parent_id, content_id, " - "link_to, link_redirect, subject, guest_name, template, sort_index, meta, ameta, url) values (") - << item.user_id - << item.modification_user_id - << item.group_id - << item.privileges - << item.date_creation - << item.date_modification - << static_cast(item.type) - << item.parent_id - << item.content_id - << item.link_to - << item.link_redirect - << item.subject - << item.guest_name - << item.html_template - << item.sort_index - << item.meta - << item.ameta; - - url_without_id = AddItemCreateUrlSubject(item); - - if( url_without_id ) - query << item.url; - else - query << R(", currval('core.item_id_seq')"); // !! zrobic test czy to obecnie dziala dobrze - - query << R(");"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - - item.id = AssertCurrval("core.item_id_seq"); - - if( !url_without_id ) - Toa(item.id, item.url); - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} +//Error Db::AddItemIntoItem(Item & item) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// bool url_without_id = false; +// +// try +// { +// query.Clear(); +// query << R("insert into core.item (user_id, modification_user_id, group_id, privileges, " +// "date_creation, date_modification, type, parent_id, content_id, " +// "link_to, link_redirect, subject, guest_name, template, sort_index, meta, ameta, url) values (") +// << item.user_id +// << item.modification_user_id +// << item.group_id +// << item.privileges +// << item.date_creation +// << item.date_modification +// << static_cast(item.type) +// << item.parent_id +// << item.content_id +// << item.link_to +// << item.link_redirect +// << item.subject +// << item.guest_name +// << item.html_template +// << item.sort_index +// << item.meta +// << item.ameta; +// +// url_without_id = AddItemCreateUrlSubject(item); +// +// if( url_without_id ) +// query << item.url; +// else +// query << R(", currval('core.item_id_seq')"); // !! zrobic test czy to obecnie dziala dobrze +// +// query << R(");"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// +// item.id = AssertCurrval("core.item_id_seq"); +// +// if( !url_without_id ) +// Toa(item.id, item.url); +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} -Error Db::AddItemIntoContent(Item & item) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - int first_ref = 1; - - try - { - query.Clear(); - query << R("insert into core.content (content, content_type, file_path, file_fs, " - "file_type, has_thumb, hash, hash_type, file_size, ref, modify_index) values (") - << item.content - << static_cast(item.content_type) - << item.file_path - << item.file_fs - << item.file_type - << static_cast(item.has_thumb) - << item.hash - << item.hash_type - << item.file_size - << first_ref - << item.modify_index - << R(");"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - - item.content_id = AssertCurrval("core.content_id_seq"); - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} +//Error Db::AddItemIntoContent(Item & item) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// int first_ref = 1; +// +// try +// { +// query.Clear(); +// query << R("insert into core.content (content, content_type, file_path, file_fs, " +// "file_type, has_thumb, hash, hash_type, file_size, ref, modify_index) values (") +// << item.content +// << static_cast(item.content_type) +// << item.file_path +// << item.file_fs +// << item.file_type +// << static_cast(item.has_thumb) +// << item.hash +// << item.hash_type +// << item.file_size +// << first_ref +// << item.modify_index +// << R(");"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// +// item.content_id = AssertCurrval("core.content_id_seq"); +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} -Error Db::AddItem(Item & item) -{ - BeginTrans(); - Error result = WINIX_ERR_OK; - - if( item.type == Item::file ) - result = AddItemIntoContent(item); - else - item.content_id = -1; - - if( result == WINIX_ERR_OK ) - result = AddItemIntoItem(item); - -return EndTrans(result); -} +//Error Db::AddItem(Item & item) +//{ +// BeginTrans(); +// Error result = WINIX_ERR_OK; +// +// if( item.type == Item::file ) +// result = AddItemIntoContent(item); +// else +// item.content_id = -1; +// +// if( result == WINIX_ERR_OK ) +// result = AddItemIntoItem(item); +// +//return EndTrans(result); +//} -Error Db::IncrementContentRef(long content_id) -{ - query.Clear(); - query << R("update core.content set (ref) = ") << R(postgrsql_row_statement) << R("(ref + 1) where id = ") - << content_id - << R(";"); - -return DoCommand(query); -} - - -Error Db::DecrementContentRef(long content_id) -{ - query.Clear(); - query << R("update core.content set (ref) = ") << R(postgrsql_row_statement) << R("(ref - 1) where id = ") - << content_id - << R(";"); - -return DoCommand(query); -} +//Error Db::IncrementContentRef(long content_id) +//{ +// query.Clear(); +// query << R("update core.content set (ref) = ") << R(postgrsql_row_statement) << R("(ref + 1) where id = ") +// << content_id +// << R(";"); +// +//return DoCommand(query); +//} +// +// +//Error Db::DecrementContentRef(long content_id) +//{ +// query.Clear(); +// query << R("update core.content set (ref) = ") << R(postgrsql_row_statement) << R("(ref - 1) where id = ") +// << content_id +// << R(";"); +// +//return DoCommand(query); +//} // item.id must be set (it's used by GetContentId) -Error Db::AddHardLink(Item & item) -{ - if( item.type != Item::file || item.content_id == -1 ) - return WINIX_ERR_FILE_EXPECTED; - - BeginTrans(); - Error result = IncrementContentRef(item.content_id); - - if( result == WINIX_ERR_OK ) - result = AddItemIntoItem(item); - -return EndTrans(result); -} +//Error Db::AddHardLink(Item & item) +//{ +// if( item.type != Item::file || item.content_id == -1 ) +// return WINIX_ERR_FILE_EXPECTED; +// +// BeginTrans(); +// Error result = IncrementContentRef(item.content_id); +// +// if( result == WINIX_ERR_OK ) +// result = AddItemIntoItem(item); +// +//return EndTrans(result); +//} -Error Db::EditItemInItem(Item & item, bool with_url) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - bool url_without_id = false; - - try - { - query.Clear(); - query << R("update core.item set (user_id, modification_user_id, group_id, privileges, " - "date_creation, date_modification, type, link_to, link_redirect, parent_id, subject, " - "guest_name, template, sort_index, meta, ameta"); - - if( with_url ) - query << R(", url"); - - query << R(") = ") << R(postgrsql_row_statement) << R("(") - << item.user_id - << item.modification_user_id - << item.group_id - << item.privileges - << item.date_creation - << item.date_modification - << static_cast(item.type) - << item.link_to - << item.link_redirect - << item.parent_id - << item.subject - << item.guest_name - << item.html_template - << item.sort_index - << item.meta - << item.ameta; - - if( with_url ) - { - url_without_id = AddItemCreateUrlSubject(item); - - if( url_without_id ) - query << item.url; - else - query << item.id; - } - - query << R(") where id=") << item.id << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - - if( with_url && !url_without_id ) - Toa(item.id, item.url); - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} +//Error Db::EditItemInItem(Item & item, bool with_url) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// bool url_without_id = false; +// +// try +// { +// query.Clear(); +// query << R("update core.item set (user_id, modification_user_id, group_id, privileges, " +// "date_creation, date_modification, type, link_to, link_redirect, parent_id, subject, " +// "guest_name, template, sort_index, meta, ameta"); +// +// if( with_url ) +// query << R(", url"); +// +// query << R(") = ") << R(postgrsql_row_statement) << R("(") +// << item.user_id +// << item.modification_user_id +// << item.group_id +// << item.privileges +// << item.date_creation +// << item.date_modification +// << static_cast(item.type) +// << item.link_to +// << item.link_redirect +// << item.parent_id +// << item.subject +// << item.guest_name +// << item.html_template +// << item.sort_index +// << item.meta +// << item.ameta; +// +// if( with_url ) +// { +// url_without_id = AddItemCreateUrlSubject(item); +// +// if( url_without_id ) +// query << item.url; +// else +// query << item.id; +// } +// +// query << R(") where id=") << item.id << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// +// if( with_url && !url_without_id ) +// Toa(item.id, item.url); +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} -Error Db::EditItemInContent(Item & item) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - - try - { - // we don't change 'ref' here - query.Clear(); - query << R("update core.content set (content, content_type, file_path, file_fs, " - "file_type, has_thumb, hash, hash_type, file_size, modify_index) = ") << R(postgrsql_row_statement) << R("(") - << item.content - << static_cast(item.content_type) - << item.file_path - << item.file_fs - << item.file_type - << static_cast(item.has_thumb) - << item.hash - << item.hash_type - << item.file_size - << item.modify_index - << R(") where id=") - << item.content_id - << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} +//Error Db::EditItemInContent(Item & item) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// +// try +// { +// // we don't change 'ref' here +// query.Clear(); +// query << R("update core.content set (content, content_type, file_path, file_fs, " +// "file_type, has_thumb, hash, hash_type, file_size, modify_index) = ") << R(postgrsql_row_statement) << R("(") +// << item.content +// << static_cast(item.content_type) +// << item.file_path +// << item.file_fs +// << item.file_type +// << static_cast(item.has_thumb) +// << item.hash +// << item.hash_type +// << item.file_size +// << item.modify_index +// << R(") where id=") +// << item.content_id +// << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} -long Db::GetContentId(long item_id) -{ - PGresult * r = 0; - long result = -1; - - try - { - query.Clear(); - query << R("select content_id from core.item where item.id=") - << item_id - << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_TUPLES_OK); - - if( Rows(r) == 1 && Cols(r) == 1 ) - result = AssertValueLong(r, 0, 0); - } - catch(const Error) - { - } - - ClearResult(r); - -return result; -} +//long Db::GetContentId(long item_id) +//{ +// PGresult * r = 0; +// long result = -1; +// +// try +// { +// query.Clear(); +// query << R("select content_id from core.item where item.id=") +// << item_id +// << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_TUPLES_OK); +// +// if( Rows(r) == 1 && Cols(r) == 1 ) +// result = AssertValueLong(r, 0, 0); +// } +// catch(const Error) +// { +// } +// +// ClearResult(r); +// +//return result; +//} // item.id must be set // !! moze nazwa poprostu EditItem (nie trzeba tego ById) ? (sprawdzic czy nie koliduje z inna nazwa) -Error Db::EditItemById(Item & item, bool with_url) -{ - BeginTrans(); - Error result = WINIX_ERR_OK; - - if( item.type == Item::file ) - { - item.content_id = GetContentId(item.id); - result = EditItemInContent(item); - } - - if( result == WINIX_ERR_OK ) - result = EditItemInItem(item, with_url); - -return EndTrans(result); -} +//Error Db::EditItemById(Item & item, bool with_url) +//{ +// BeginTrans(); +// Error result = WINIX_ERR_OK; +// +// if( item.type == Item::file ) +// { +// item.content_id = GetContentId(item.id); +// result = EditItemInContent(item); +// } +// +// if( result == WINIX_ERR_OK ) +// result = EditItemInItem(item, with_url); +// +//return EndTrans(result); +//} -Error Db::EditItemGetIdsByUrl(Item & item) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - - try - { - query.Clear(); - query << R("select id, content_id from core.item where parent_id=") - << item.parent_id - << R(" and item.url=") - << item.url - << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_TUPLES_OK); - - if( Rows(r) != 1 ) - throw Error(WINIX_ERR_NO_ITEM); - - int cid = AssertColumn(r, "id"); - int cc_id = AssertColumn(r, "content_id"); - item.id = AssertValueLong(r, 0, cid); - item.content_id = AssertValueLong(r, 0, cc_id); - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} +//Error Db::EditItemGetIdsByUrl(Item & item) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// +// try +// { +// query.Clear(); +// query << R("select id, content_id from core.item where parent_id=") +// << item.parent_id +// << R(" and item.url=") +// << item.url +// << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_TUPLES_OK); +// +// if( Rows(r) != 1 ) +// throw Error(WINIX_ERR_NO_ITEM); +// +// int cid = AssertColumn(r, "id"); +// int cc_id = AssertColumn(r, "content_id"); +// item.id = AssertValueLong(r, 0, cid); +// item.content_id = AssertValueLong(r, 0, cc_id); +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} // item.url and item.parent_id must be set -Error Db::EditItemByUrl(Item & item, bool with_url) -{ - BeginTrans(); - Error result = EditItemGetIdsByUrl(item); - - if( result == WINIX_ERR_OK ) - { - if( item.type == Item::file ) - result = EditItemInContent(item); - - if( result == WINIX_ERR_OK ) - result = EditItemInItem(item, with_url); - } - -return EndTrans(result); -} +//Error Db::EditItemByUrl(Item & item, bool with_url) +//{ +// BeginTrans(); +// Error result = EditItemGetIdsByUrl(item); +// +// if( result == WINIX_ERR_OK ) +// { +// if( item.type == Item::file ) +// result = EditItemInContent(item); +// +// if( result == WINIX_ERR_OK ) +// result = EditItemInItem(item, with_url); +// } +// +//return EndTrans(result); +//} -Error Db::EditLinkItem(long id, const std::wstring & link_to, int link_redirect) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - - try - { - query.Clear(); - query << R("update core.item set (link_to, link_redirect) = ") << R(postgrsql_row_statement) << R("(") - << link_to - << link_redirect - << R(") where id=") - << id - << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - - if( AffectedRows(r) == 0 ) - { - result = WINIX_ERR_NO_ITEM; - log << log1 << "Db: EditLinkItem: no such an item, id: " << id << logend; - } - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} +//Error Db::EditLinkItem(long id, const std::wstring & link_to, int link_redirect) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// +// try +// { +// query.Clear(); +// query << R("update core.item set (link_to, link_redirect) = ") << R(postgrsql_row_statement) << R("(") +// << link_to +// << link_redirect +// << R(") where id=") +// << id +// << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// +// if( AffectedRows(r) == 0 ) +// { +// result = WINIX_ERR_NO_ITEM; +// log << log1 << "Db: EditLinkItem: no such an item, id: " << id << logend; +// } +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} -Error Db::EditTemplateItemById(long id, const std::wstring & new_html_template) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - - try - { - query.Clear(); - query << R("update core.item set (template) = ") << R(postgrsql_row_statement) << R("(") - << new_html_template - << R(") where id=") - << id - << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - - if( AffectedRows(r) == 0 ) - { - result = WINIX_ERR_NO_ITEM; - log << log1 << "Db: EditTemplateItemById: no such an item, id: " << id << logend; - } - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} +//Error Db::EditTemplateItemById(long id, const std::wstring & new_html_template) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// +// try +// { +// query.Clear(); +// query << R("update core.item set (template) = ") << R(postgrsql_row_statement) << R("(") +// << new_html_template +// << R(") where id=") +// << id +// << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// +// if( AffectedRows(r) == 0 ) +// { +// result = WINIX_ERR_NO_ITEM; +// log << log1 << "Db: EditTemplateItemById: no such an item, id: " << id << logend; +// } +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} -Error Db::EditSortIndexItemById(long id, int sort_index) -{ - query.Clear(); - query << R("update core.item set (sort_index) = ") << R(postgrsql_row_statement) << R("(") - << sort_index - << R(") where id=") - << id - << R(";"); - - return DoCommand(query); -} +//Error Db::EditSortIndexItemById(long id, int sort_index) +//{ +// query.Clear(); +// query << R("update core.item set (sort_index) = ") << R(postgrsql_row_statement) << R("(") +// << sort_index +// << R(") where id=") +// << id +// << R(";"); +// +// return DoCommand(query); +//} -void Db::GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel) -{ - query << R("select item.id, content_id"); - - if( !skip_other_sel ) - { - if( iq.sel_parent_id ) query << R(", parent_id"); - if( iq.sel_user_id ) query << R(", user_id, modification_user_id"); - if( iq.sel_group_id ) query << R(", group_id"); - if( iq.sel_guest_name) query << R(", guest_name"); - if( iq.sel_privileges ) query << R(", privileges"); - if( iq.sel_date ) query << R(", date_creation, date_modification"); - if( iq.sel_subject ) query << R(", subject"); - if( iq.sel_content ) query << R(", content, content_type, ref, modify_index"); - if( iq.sel_url ) query << R(", url"); - if( iq.sel_type ) query << R(", type"); - if( iq.sel_link ) query << R(", link_to, link_redirect"); - if( iq.sel_file ) query << R(", file_path, file_fs, file_type, has_thumb, hash, hash_type, file_size"); - if( iq.sel_html_template ) query << R(", template"); - if( iq.sel_sort_index ) query << R(", sort_index"); - if( iq.sel_meta ) query << R(", meta, ameta"); - } - - query << R(" from core.item"); -} +//void Db::GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel) +//{ +// query << R("select item.id, content_id"); +// +// if( !skip_other_sel ) +// { +// if( iq.sel_parent_id ) query << R(", parent_id"); +// if( iq.sel_user_id ) query << R(", user_id, modification_user_id"); +// if( iq.sel_group_id ) query << R(", group_id"); +// if( iq.sel_guest_name) query << R(", guest_name"); +// if( iq.sel_privileges ) query << R(", privileges"); +// if( iq.sel_date ) query << R(", date_creation, date_modification"); +// if( iq.sel_subject ) query << R(", subject"); +// if( iq.sel_content ) query << R(", content, content_type, ref, modify_index"); +// if( iq.sel_url ) query << R(", url"); +// if( iq.sel_type ) query << R(", type"); +// if( iq.sel_link ) query << R(", link_to, link_redirect"); +// if( iq.sel_file ) query << R(", file_path, file_fs, file_type, has_thumb, hash, hash_type, file_size"); +// if( iq.sel_html_template ) query << R(", template"); +// if( iq.sel_sort_index ) query << R(", sort_index"); +// if( iq.sel_meta ) query << R(", meta, ameta"); +// } +// +// query << R(" from core.item"); +//} -void Db::GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query) -{ - if( iq.sel_content || iq.sel_file || iq.where_file_type ) - query << R(" left join core.content on item.content_id = content.id"); -} +//void Db::GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query) +//{ +// if( iq.sel_content || iq.sel_file || iq.where_file_type ) +// query << R(" left join core.content on item.content_id = content.id"); +//} -void Db::GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query) -{ - if( iq.where_id || iq.where_parent_id || iq.where_type || iq.where_file_type ) - { - query << R(" where "); - const char * add_and = " and "; - const char * if_and = ""; - - if( iq.where_id ) { query << R(if_and) << R("item.id=") << iq.id ; if_and = add_and; } - - if( iq.id_tab && !iq.id_tab->empty() ) - { - CreateIdList(*iq.id_tab, iq_id_list); - query << R(if_and) << R("item.id in ") << R(iq_id_list); - if_and = add_and; - } - - if( iq.where_parent_id ){ query << R(if_and) << R("parent_id=") << iq.parent_id ; if_and = add_and; } - - if( iq.where_type ) - { - query << R(if_and) << R("type"); - - if( iq.type_equal ) - query << R("="); - else - query << R("!="); - - query << int(iq.type); - if_and = add_and; - } +//void Db::GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query) +//{ +// if( iq.where_id || iq.where_parent_id || iq.where_type || iq.where_file_type ) +// { +// query << R(" where "); +// const char * add_and = " and "; +// const char * if_and = ""; +// +// if( iq.where_id ) { query << R(if_and) << R("item.id=") << iq.id ; if_and = add_and; } +// +// if( iq.id_tab && !iq.id_tab->empty() ) +// { +// CreateIdList(*iq.id_tab, iq_id_list); +// query << R(if_and) << R("item.id in ") << R(iq_id_list); +// if_and = add_and; +// } +// +// if( iq.where_parent_id ){ query << R(if_and) << R("parent_id=") << iq.parent_id ; if_and = add_and; } +// +// if( iq.where_type ) +// { +// query << R(if_and) << R("type"); +// +// if( iq.type_equal ) +// query << R("="); +// else +// query << R("!="); +// +// query << int(iq.type); +// if_and = add_and; +// } +// +// +// if( iq.where_file_type ) +// { +// query << R(if_and) << R("file_type"); +// +// if( iq.file_type_equal ) +// query << R("="); +// else +// query << R("!="); +// +// query << iq.file_type; +// if_and = add_and; +// } +// } +//} - if( iq.where_file_type ) - { - query << R(if_and) << R("file_type"); - - if( iq.file_type_equal ) - query << R("="); - else - query << R("!="); - - query << iq.file_type; - if_and = add_and; - } - } -} +//void Db::GetItemsQueryOrder(bool sort_asc) +//{ +// if( sort_asc ) +// query << R(" asc"); +// else +// query << R(" desc"); +//} -void Db::GetItemsQueryOrder(bool sort_asc) -{ - if( sort_asc ) - query << R(" asc"); - else - query << R(" desc"); -} +//void Db::GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query) +//{ +// if( iq.sel_sort_index || iq.sel_date ) +// { +// query << R(" order by"); +// +// if( iq.sel_sort_index ) +// { +// query << R(" sort_index"); +// GetItemsQueryOrder(iq.sort_index_asc); +// } +// +// if( iq.sel_date ) +// { +// if( iq.sel_sort_index ) +// query << R(","); +// +// query << R(" item.date_creation"); +// GetItemsQueryOrder(iq.sort_date_asc); +// } +// } +//} -void Db::GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query) -{ - if( iq.sel_sort_index || iq.sel_date ) - { - query << R(" order by"); - - if( iq.sel_sort_index ) - { - query << R(" sort_index"); - GetItemsQueryOrder(iq.sort_index_asc); - } - - if( iq.sel_date ) - { - if( iq.sel_sort_index ) - query << R(","); - - query << R(" item.date_creation"); - GetItemsQueryOrder(iq.sort_date_asc); - } - } -} +//void Db::GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query) +//{ +// if( iq.limit != 0 ) +// query << R(" limit ") << iq.limit; +// +// if( iq.offset != 0 ) +// query << R(" offset ") << iq.offset; +//} -void Db::GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query) -{ - if( iq.limit != 0 ) - query << R(" limit ") << iq.limit; - - if( iq.offset != 0 ) - query << R(" offset ") << iq.offset; -} - - -PGresult * Db::GetItemsQuery(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel) -{ - query.Clear(); - - GetItemsQuerySelect(iq, query, skip_other_sel); - GetItemsQueryJoin(iq, query); - GetItemsQueryWhere(iq, query); - GetItemsQueryOrder(iq, query); - GetItemsQueryLimit(iq, query); - - query << R(";"); - -return AssertQuery(query); -} +//PGresult * Db::GetItemsQuery(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel) +//{ +// query.Clear(); +// +// GetItemsQuerySelect(iq, query, skip_other_sel); +// GetItemsQueryJoin(iq, query); +// GetItemsQueryWhere(iq, query); +// GetItemsQueryOrder(iq, query); +// GetItemsQueryLimit(iq, query); +// +// query << R(";"); +// +//return AssertQuery(query); +//} -PGresult * Db::GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel) -{ - return GetItemsQuery(iq, query, skip_other_sel); -} +//PGresult * Db::GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel) +//{ +// return GetItemsQuery(iq, query, skip_other_sel); +//} -void Db::GetItems(std::vector & item_tab, const DbItemQuery & item_query) -{ - item_tab.clear(); - PGresult * r = 0; - - try - { - r = GetItemsQuery(item_query); - AssertResult(r, PGRES_TUPLES_OK); - - get_item_temp.Clear(); - int rows = Rows(r); - - if( rows > 0 && size_t(rows) > item_tab.capacity() ) - item_tab.reserve(rows); - - item_cols.SetColumns(r); - - for(int i=0 ; i & item_tab, const DbItemQuery & item_query) +//{ +// item_tab.clear(); +// PGresult * r = 0; +// +// try +// { +// r = GetItemsQuery(item_query); +// AssertResult(r, PGRES_TUPLES_OK); +// +// get_item_temp.Clear(); +// int rows = Rows(r); +// +// if( rows > 0 && size_t(rows) > item_tab.capacity() ) +// item_tab.reserve(rows); +// +// item_cols.SetColumns(r); +// +// for(int i=0 ; i & item_tab, const DbItemQuery & item_query) -{ - item_tab.clear(); - PGresult * r = 0; - - try - { - r = GetItemsQuery(item_query, true); - AssertResult(r, PGRES_TUPLES_OK); - - int rows = Rows(r); - - for(int i = 0 ; i & item_tab, const DbItemQuery & item_query) +//{ +// item_tab.clear(); +// PGresult * r = 0; +// +// try +// { +// r = GetItemsQuery(item_query, true); +// AssertResult(r, PGRES_TUPLES_OK); +// +// int rows = Rows(r); +// +// for(int i = 0 ; i(item.has_thumb) - << item.hash - << item.hash_type - << item.file_size - << R(") where id=") << content_id << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return EndTrans(result); -} - - - -Error Db::EditHasThumbById(bool has_thumb, long id) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - - BeginTrans(); - - try - { - long content_id = GetContentId(id); - - if( content_id == -1 ) - throw Error(WINIX_ERR_NO_ITEM); - - query.Clear(); - query << R("update core.content set (has_thumb) = ") << R(postgrsql_row_statement) << R("(") - << static_cast(has_thumb) - << R(") where id=") << content_id << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return EndTrans(result); -} - - - -Error Db::EditMetaById(const PT::Space & meta, long id) -{ - query.Clear(); - query << R("update core.item set (meta) = ") << R(postgrsql_row_statement) << R("(") - << meta - << R(") where id=") - << id - << R(";"); - -return DoCommand(query); -} - - -Error Db::EditAdminMetaById(const PT::Space & ameta, long id) -{ - query.Clear(); - query << R("update core.item set (ameta) = ") << R(postgrsql_row_statement) << R("(") - << ameta - << R(") where id=") - << id - << R(";"); - -return DoCommand(query); -} - - - - -Error Db::EditSubjectById(Item & item, long id) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - - try - { - query.Clear(); - query << R("update core.item set (subject) = ") << R(postgrsql_row_statement) << R("(") - << item.subject - << R(") where id=") - << id - << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} - - - -Error Db::DelDirById(long id) -{ - Error result = WINIX_ERR_OK; - PGresult * r = 0; - - BeginTrans(); - - try - { - // decrementing ref in core.content - query.Clear(); - query << R("update core.content set (ref) = ") << R(postgrsql_row_statement) << R("(ref - 1) where content.id in " - "(select content_id from core.item where type=1 and parent_id=") - << id - << R(");"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - ClearResult(r); - - // deleting in core.content where ref is zero - query.Clear(); - query << R("delete from core.content where ref=0;"); - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - log << log2 << "Db: deleted " << AffectedRows(r) << " rows from core.content" << logend; - ClearResult(r); - - // deleting from core.item - query.Clear(); - query << R("delete from core.item where id=") - << id - << R(" or parent_id=") - << id - << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - log << log2 << "Db: deleted dir: " << id << " (deleted: " << AffectedRows(r) << " rows from core.item)" << logend; - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return EndTrans(result); -} - - - - -Error Db::DelItemDelItem(long item_id, int type) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - - try - { - query.Clear(); - query << R("delete from core.item where id=") - << item_id - << R(" and type=") - << type - << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - - log << log2 << "Db: deleted " << AffectedRows(r) << " from core.item" << logend; - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} - - - - -Error Db::DelItemDelContent(long content_id) -{ - PGresult * r = 0; - Error result = WINIX_ERR_OK; - - try - { - result = DecrementContentRef(content_id); - - if( result == WINIX_ERR_OK ) - { - query.Clear(); - query << R("delete from core.content where ref=0 and id=") - << content_id - << R(";"); - - r = AssertQuery(query); - AssertResult(r, PGRES_COMMAND_OK); - - log << log2 << "Db: deleted " << AffectedRows(r) << " rows from core.content" << logend; - } - } - catch(const Error & e) - { - result = e; - } - - ClearResult(r); - -return result; -} - - - - - - -Error Db::DelItem(const Item & item) -{ -Error result = WINIX_ERR_NO_ITEM; - - if( item.type == Item::file ) - { - BeginTrans(); - result = DelItemDelContent(item.content_id); - - if( result == WINIX_ERR_OK ) - result = DelItemDelItem(item.id, 1); - - result = EndTrans(result); - } - else - if( item.type == Item::symlink ) - { - result = DelItemDelItem(item.id, 2); - } - else - if( item.type == Item::dir ) - { - result = DelDirById(item.id); - } - -return result; -} - - - - -Error Db::DelFileById(long file_id) -{ -Error result = WINIX_ERR_NO_ITEM; - - BeginTrans(); - - long content_id = GetContentId(file_id); - - if( content_id != -1 ) - { - result = DelItemDelContent(content_id); - - if( result == WINIX_ERR_OK ) - result = DelItemDelItem(file_id, 1); - } - - result = EndTrans(result); - -return result; -} - - - -Error Db::DelSymlinkById(long symlink_id) -{ - return DelItemDelItem(symlink_id, 2); -} - - -void Db::GetDirs(DirContainer & dir_tab) -{ - PGresult * r = 0; - - try - { - query.Clear(); - query << R("select * from core.item where type=0;"); - - r = AssertQuery(query); - AssertResult(r, PGRES_TUPLES_OK); - - dir_temp.Clear(); - int rows = Rows(r); - item_cols.SetColumns(r); - - for(int i=0 ; i(item.has_thumb) +// << item.hash +// << item.hash_type +// << item.file_size +// << R(") where id=") << content_id << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return EndTrans(result); +//} + + + +//Error Db::EditHasThumbById(bool has_thumb, long id) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// +// BeginTrans(); +// +// try +// { +// long content_id = GetContentId(id); +// +// if( content_id == -1 ) +// throw Error(WINIX_ERR_NO_ITEM); +// +// query.Clear(); +// query << R("update core.content set (has_thumb) = ") << R(postgrsql_row_statement) << R("(") +// << static_cast(has_thumb) +// << R(") where id=") << content_id << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return EndTrans(result); +//} + + + +//Error Db::EditMetaById(const PT::Space & meta, long id) +//{ +// query.Clear(); +// query << R("update core.item set (meta) = ") << R(postgrsql_row_statement) << R("(") +// << meta +// << R(") where id=") +// << id +// << R(";"); +// +//return DoCommand(query); +//} + + +//Error Db::EditAdminMetaById(const PT::Space & ameta, long id) +//{ +// query.Clear(); +// query << R("update core.item set (ameta) = ") << R(postgrsql_row_statement) << R("(") +// << ameta +// << R(") where id=") +// << id +// << R(";"); +// +//return DoCommand(query); +//} + + + + +//Error Db::EditSubjectById(Item & item, long id) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// +// try +// { +// query.Clear(); +// query << R("update core.item set (subject) = ") << R(postgrsql_row_statement) << R("(") +// << item.subject +// << R(") where id=") +// << id +// << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} + + + +//Error Db::DelDirById(long id) +//{ +// Error result = WINIX_ERR_OK; +// PGresult * r = 0; +// +// BeginTrans(); +// +// try +// { +// // decrementing ref in core.content +// query.Clear(); +// query << R("update core.content set (ref) = ") << R(postgrsql_row_statement) << R("(ref - 1) where content.id in " +// "(select content_id from core.item where type=1 and parent_id=") +// << id +// << R(");"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// ClearResult(r); +// +// // deleting in core.content where ref is zero +// query.Clear(); +// query << R("delete from core.content where ref=0;"); +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// log << log2 << "Db: deleted " << AffectedRows(r) << " rows from core.content" << logend; +// ClearResult(r); +// +// // deleting from core.item +// query.Clear(); +// query << R("delete from core.item where id=") +// << id +// << R(" or parent_id=") +// << id +// << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// log << log2 << "Db: deleted dir: " << id << " (deleted: " << AffectedRows(r) << " rows from core.item)" << logend; +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return EndTrans(result); +//} + + + + +//Error Db::DelItemDelItem(long item_id, int type) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// +// try +// { +// query.Clear(); +// query << R("delete from core.item where id=") +// << item_id +// << R(" and type=") +// << type +// << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// +// log << log2 << "Db: deleted " << AffectedRows(r) << " from core.item" << logend; +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} + + + + +//Error Db::DelItemDelContent(long content_id) +//{ +// PGresult * r = 0; +// Error result = WINIX_ERR_OK; +// +// try +// { +// result = DecrementContentRef(content_id); +// +// if( result == WINIX_ERR_OK ) +// { +// query.Clear(); +// query << R("delete from core.content where ref=0 and id=") +// << content_id +// << R(";"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_COMMAND_OK); +// +// log << log2 << "Db: deleted " << AffectedRows(r) << " rows from core.content" << logend; +// } +// } +// catch(const Error & e) +// { +// result = e; +// } +// +// ClearResult(r); +// +//return result; +//} + + + + + + +//Error Db::DelItem(const Item & item) +//{ +//Error result = WINIX_ERR_NO_ITEM; +// +// if( item.type == Item::file ) +// { +// BeginTrans(); +// result = DelItemDelContent(item.content_id); +// +// if( result == WINIX_ERR_OK ) +// result = DelItemDelItem(item.id, 1); +// +// result = EndTrans(result); +// } +// else +// if( item.type == Item::symlink ) +// { +// result = DelItemDelItem(item.id, 2); +// } +// else +// if( item.type == Item::dir ) +// { +// result = DelDirById(item.id); +// } +// +//return result; +//} + + + + +//Error Db::DelFileById(long file_id) +//{ +//Error result = WINIX_ERR_NO_ITEM; +// +// BeginTrans(); +// +// long content_id = GetContentId(file_id); +// +// if( content_id != -1 ) +// { +// result = DelItemDelContent(content_id); +// +// if( result == WINIX_ERR_OK ) +// result = DelItemDelItem(file_id, 1); +// } +// +// result = EndTrans(result); +// +//return result; +//} + + + +//Error Db::DelSymlinkById(long symlink_id) +//{ +// return DelItemDelItem(symlink_id, 2); +//} + + +//void Db::GetDirs(DirContainer & dir_tab) +//{ +// PGresult * r = 0; +// +// try +// { +// query.Clear(); +// query << R("select * from core.item where type=0;"); +// +// r = AssertQuery(query); +// AssertResult(r, PGRES_TUPLES_OK); +// +// dir_temp.Clear(); +// int rows = Rows(r); +// item_cols.SetColumns(r); +// +// for(int i=0 ; i & user_tab) { PGresult * r = 0; - + try { query.Clear(); @@ -1666,7 +1666,7 @@ void Db::GetUsers(UGContainer & user_tab) " env, aenv, status, locale_id, time_zone_id" " from core.user left outer join core.group_mem on" " core.user.id = core.group_mem.user_id order by id asc;"); - + r = AssertQuery(query); AssertResult(r, PGRES_TUPLES_OK); @@ -1691,7 +1691,7 @@ void Db::GetUsers(UGContainer & user_tab) for(int i=0 ; i & user_tab) u.time_zone_id = (size_t)AssertValueInt(r, i, ctzone_id); AssertValueSpace(r, i, cenv, u.env); AssertValueSpace(r, i, caenv, u.aenv); - + log << log2 << "Db: user: id: " << u.id << ", name: " << u.name << ", super_user: " << u.super_user << logend; iter = user_tab.PushBack(u); @@ -1713,7 +1713,7 @@ void Db::GetUsers(UGContainer & user_tab) last_id = u.id; } - + long group_id = AssertValueLong(r, i, cgroup_id); if( !IsNull(r, i, cgroup_id) && group_id!=-1 && iter!=user_tab.End() ) @@ -1726,7 +1726,7 @@ void Db::GetUsers(UGContainer & user_tab) catch(const Error &) { } - + ClearResult(r); } @@ -1735,13 +1735,13 @@ void Db::GetUsers(UGContainer & user_tab) void Db::GetGroups(UGContainer & group_tab) { PGresult * r = 0; - + try { query.Clear(); query << R("select id, core.group.group, user_id from core.group left outer join" " core.group_mem on core.group.id = core.group_mem.group_id order by id asc;"); - + r = AssertQuery(query); AssertResult(r, PGRES_TUPLES_OK); @@ -1767,7 +1767,7 @@ void Db::GetGroups(UGContainer & group_tab) iter = group_tab.PushBack( g ); last_id = g.id; } - + long user_id = AssertValueLong(r, i, cuser_id); if( !IsNull(r, i, cuser_id) && user_id!=-1 && !group_tab.Empty() ) @@ -1780,7 +1780,7 @@ void Db::GetGroups(UGContainer & group_tab) catch(const Error &) { } - + ClearResult(r); } diff --git a/winixd/db/db.h b/winixd/db/db.h index 02616e8..9eb08b7 100644 --- a/winixd/db/db.h +++ b/winixd/db/db.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include "dbbase.h" #include "dbitemquery.h" #include "dbitemcolumns.h" -#include "core/item.h" +//#include "core/item.h" #include "core/user.h" #include "core/group.h" #include "core/dircontainer.h" @@ -60,12 +60,12 @@ class Db : public DbBase { public: - // !! przerobic tak aby GetItem zwracalo wszystkie pozycja - // !! GetFile tylko dla plikow - // !! GetDir tylko dla katalogow - // !! GetFile i GetDir beda uzywac GetItem - - Db() : item_cols(*this) +// Db() : item_cols(*this) +// { +// is_postgresql_smaller_than_10 = false; +// } + + Db() { is_postgresql_smaller_than_10 = false; } @@ -83,91 +83,91 @@ public: Error ChangeUserTimeZone(long user_id, size_t time_zone_id); Error RemoveUser(long user_id); - Error AddItem(Item & item); - Error EditItemById(Item & item, bool with_url = true); - Error EditItemByUrl(Item & item, bool with_url = true); + //Error AddItem(Item & item); + //Error EditItemById(Item & item, bool with_url = true); + //Error EditItemByUrl(Item & item, bool with_url = true); // !! nie zwracac zadnych kodow bledow? - void GetItems(std::vector & item_tab, const DbItemQuery & item_query); - void GetItems(std::vector & item_tab, const DbItemQuery & item_query); - Error GetItem(Item & item, const DbItemQuery & item_query); + //void GetItems(std::vector & item_tab, const DbItemQuery & item_query); + //void GetItems(std::vector & item_tab, const DbItemQuery & item_query); + //Error GetItem(Item & item, const DbItemQuery & item_query); - bool GetPriv(Item & item, long id); - Error EditPrivById(Item & item, long id); // !! dlaczego tu nie ma const? - Error EditParentUrlById(Item & item, long id); - Error EditFileById(const Item & item, long id); // file_path, file_fs, file_type - Error EditHasThumbById(bool has_thumb, long id); - Error EditMetaById(const PT::Space & meta, long id); - Error EditAdminMetaById(const PT::Space & meta, long id); + //bool GetPriv(Item & item, long id); + //Error EditPrivById(Item & item, long id); // !! dlaczego tu nie ma const? + //Error EditParentUrlById(Item & item, long id); + //Error EditFileById(const Item & item, long id); // file_path, file_fs, file_type + //Error EditHasThumbById(bool has_thumb, long id); + //Error EditMetaById(const PT::Space & meta, long id); + //Error EditAdminMetaById(const PT::Space & meta, long id); - Error DelDirById(long id); - Error DelFileById(long file_id); - Error DelSymlinkById(long symlink_id); + //Error DelDirById(long id); + //Error DelFileById(long file_id); + //Error DelSymlinkById(long symlink_id); - Error EditSubjectById(Item & item, long id); + //Error EditSubjectById(Item & item, long id); - Error DelItem(const Item & item); - void GetDirs(DirContainer & dir_tab); + //Error DelItem(const Item & item); + //void GetDirs(DirContainer & dir_tab); void GetUsers(UGContainer & user_tab); void GetGroups(UGContainer & group_tab); // !! nowy interfejs - long Size(long parent_id, Item::Type type = Item::none); + //long Size(long parent_id, Item::Type type = Item::none); - Error GetItemById(long item_id, Item & item); - Error GetItem(long parent_id, const std::wstring & url, Item & item); - Error EditLinkItem(long id, const std::wstring & link_to, int link_redirect); - Error EditTemplateItemById(long id, const std::wstring & new_html_template); + //Error GetItemById(long item_id, Item & item); + //Error GetItem(long parent_id, const std::wstring & url, Item & item); + //Error EditLinkItem(long id, const std::wstring & link_to, int link_redirect); + //Error EditTemplateItemById(long id, const std::wstring & new_html_template); - long GetItemId(long parent_id, const std::wstring & url, Item::Type type); - long GetFileId(long parent_id, const std::wstring & url); - long GetDirId(long parent_id, const std::wstring & url); + //long GetItemId(long parent_id, const std::wstring & url, Item::Type type); + //long GetFileId(long parent_id, const std::wstring & url); + //long GetDirId(long parent_id, const std::wstring & url); - Error AddHardLink(Item & item); - Error EditSortIndexItemById(long id, int sort_index); + //Error AddHardLink(Item & item); + //Error EditSortIndexItemById(long id, int sort_index); protected: DbTextStream query, query_create_url; - std::wstring temp_url; - Item dir_temp; - Item get_item_temp; - std::wstring iq_id_list; - DbItemColumns item_cols; + //std::wstring temp_url; + //Item dir_temp; + //Item get_item_temp; + //std::wstring iq_id_list; + //DbItemColumns item_cols; bool is_postgresql_smaller_than_10; std::wstring postgrsql_row_statement; - bool AddItemCreateUrlSubject(Item & item); + //bool AddItemCreateUrlSubject(Item & item); - Error AddItemIntoContent(Item & item); - Error AddItemIntoItem(Item & item); + //Error AddItemIntoContent(Item & item); + //Error AddItemIntoItem(Item & item); - Error EditItemInItem(Item & item, bool with_url); - Error EditItemInContent(Item & item); - Error EditItemGetIdsByUrl(Item & item); - long GetContentId(long item_id); + //Error EditItemInItem(Item & item, bool with_url); + //Error EditItemInContent(Item & item); + //Error EditItemGetIdsByUrl(Item & item); + //long GetContentId(long item_id); - Error DelItemDelItem(long item_id, int type); - Error DelItemDelContent(long content_id); + //Error DelItemDelItem(long item_id, int type); + //Error DelItemDelContent(long content_id); - Error IncrementContentRef(long content_id); - Error DecrementContentRef(long content_id); + //Error IncrementContentRef(long content_id); + //Error DecrementContentRef(long content_id); - void GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel); - void GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query); - void GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query); - void GetItemsQueryOrder(bool sort_asc); - void GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query); - void GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query); - PGresult * GetItemsQuery(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel = false); - PGresult * GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel = false); + //void GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel); + //void GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query); + //void GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query); + //void GetItemsQueryOrder(bool sort_asc); + //void GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query); + //void GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query); + //PGresult * GetItemsQuery(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel = false); + //PGresult * GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel = false); }; diff --git a/winixd/db/dbitemcolumns.cpp b/winixd/db/dbitemcolumns.cpp index 6281a0d..2f14df6 100644 --- a/winixd/db/dbitemcolumns.cpp +++ b/winixd/db/dbitemcolumns.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,7 @@ namespace Winix { - +/* void DbItemColumns::SetColumns(PGresult * r) { @@ -115,7 +115,7 @@ void DbItemColumns::SetItem(PGresult * r, long row, Item & item) if( ameta != -1 ) db_base.AssertValueSpace(r, row, ameta, item.ameta); } - +*/ } // namespace Winix diff --git a/winixd/db/dbitemcolumns.h b/winixd/db/dbitemcolumns.h index 24c467c..635dd7d 100644 --- a/winixd/db/dbitemcolumns.h +++ b/winixd/db/dbitemcolumns.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,14 +36,14 @@ #define headerfile_winix_db_dbitemcolumns #include -#include "core/item.h" +//#include "core/item.h" #include "dbbase.h" namespace Winix { - +/* struct DbItemColumns { @@ -91,7 +91,7 @@ private: }; - +*/ } // namespace Winix diff --git a/winixd/db/dbitemquery.cpp b/winixd/db/dbitemquery.cpp index faa8346..2cc4a69 100644 --- a/winixd/db/dbitemquery.cpp +++ b/winixd/db/dbitemquery.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2015, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ namespace Winix { - +/* DbItemQuery::DbItemQuery() { @@ -158,7 +158,7 @@ void DbItemQuery::Offset(long o) offset = o; } - +*/ } // namespace Winix diff --git a/winixd/db/dbitemquery.h b/winixd/db/dbitemquery.h index 9f1eed6..055554e 100644 --- a/winixd/db/dbitemquery.h +++ b/winixd/db/dbitemquery.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2015, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,14 +36,14 @@ #define headerfile_winix_db_dbitemquery #include -#include "core/item.h" +//#include "core/item.h" namespace Winix { - +/* struct DbItemQuery { @@ -101,6 +101,7 @@ struct DbItemQuery }; +*/ } // namespace Winix diff --git a/winixd/functions/Makefile.dep b/winixd/functions/Makefile.dep index 60bca1c..1ca6979 100644 --- a/winixd/functions/Makefile.dep +++ b/winixd/functions/Makefile.dep @@ -1,18 +1,17 @@ # DO NOT DELETE -account.o: account.h functionbase.h ../../../winix/winixd/core/item.h -account.o: ../../../pikotools/space/space.h -account.o: ../../../pikotools/textstream/types.h -account.o: ../../../pikotools/date/date.h -account.o: ../../../pikotools/convert/inttostr.h -account.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +account.o: account.h functionbase.h ../../../winix/winixd/db/db.h +account.o: ../../../winix/winixd/db/dbbase.h account.o: ../../../winix/winixd/db/dbconn.h account.o: ../../../winix/winixd/db/dbtextstream.h account.o: ../../../winix/winixd/core/textstream.h account.o: ../../../winix/winixd/core/misc.h -account.o: ../../../winix/winixd/core/item.h account.o: ../../../winix/winixd/core/requesttypes.h account.o: ../../../pikotools/textstream/textstream.h +account.o: ../../../pikotools/space/space.h +account.o: ../../../pikotools/textstream/types.h +account.o: ../../../pikotools/date/date.h +account.o: ../../../pikotools/convert/inttostr.h account.o: ../../../pikotools/membuffer/membuffer.h account.o: ../../../pikotools/textstream/types.h account.o: ../../../pikotools/utf8/utf8.h @@ -40,6 +39,16 @@ account.o: ../../../winix/winixd/core/user.h account.o: ../../../winix/winixd/core/group.h account.o: ../../../winix/winixd/core/dircontainer.h account.o: ../../../winix/winixd/core/winixbase.h +account.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +account.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +account.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +account.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +account.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +account.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +account.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +account.o: ../../../morm/src/fieldvaluehelper.h +account.o: ../../../morm/src/flatexpression.h +account.o: ../../../winix/winixd/models/itemcontent.h account.o: ../../../winix/winixd/core/ugcontainer.h account.o: ../../../winix/winixd/core/request.h account.o: ../../../winix/winixd/core/error.h @@ -54,16 +63,8 @@ account.o: ../../../winix/winixd/core/winixmodel.h account.o: ../../../winix/winixd/core/plugin.h account.o: ../../../winix/winixd/core/pluginmsg.h account.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -account.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -account.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -account.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -account.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -account.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -account.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -account.o: ../../../morm/src/finderhelper.h -account.o: ../../../morm/src/fieldvaluehelper.h -account.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -account.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +account.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +account.o: ../../../morm/src/jsonexpression.h account.o: ../../../morm/src/postgresqlexpression.h account.o: ../../../morm/src/jsonconnector.h account.o: ../../../morm/src/postgresqlconnector.h @@ -93,8 +94,9 @@ account.o: ../../../pikotools/convert/patternreplacer.h account.o: ../../../winix/winixd/templates/patterns.h locale.h account.o: ../../../winix/winixd/templates/localefilter.h account.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -account.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -account.o: functionparser.h ../../../winix/winixd/core/cur.h +account.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +account.o: ../../../ezc/src/cache.h functions.h functionparser.h +account.o: ../../../winix/winixd/core/cur.h account.o: ../../../winix/winixd/core/winixmodel.h adduser.h cat.h chmod.h account.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h account.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -120,19 +122,18 @@ account.o: ../../../winix/winixd/core/users.h account.o: ../../../winix/winixd/core/timezones.h account.o: ../../../winix/winixd/core/misc.h account.o: ../../../winix/winixd/functions/functions.h -adduser.o: adduser.h functionbase.h ../../../winix/winixd/core/item.h -adduser.o: ../../../pikotools/space/space.h -adduser.o: ../../../pikotools/textstream/types.h -adduser.o: ../../../pikotools/date/date.h -adduser.o: ../../../pikotools/convert/inttostr.h -adduser.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +adduser.o: adduser.h functionbase.h ../../../winix/winixd/db/db.h +adduser.o: ../../../winix/winixd/db/dbbase.h adduser.o: ../../../winix/winixd/db/dbconn.h adduser.o: ../../../winix/winixd/db/dbtextstream.h adduser.o: ../../../winix/winixd/core/textstream.h adduser.o: ../../../winix/winixd/core/misc.h -adduser.o: ../../../winix/winixd/core/item.h adduser.o: ../../../winix/winixd/core/requesttypes.h adduser.o: ../../../pikotools/textstream/textstream.h +adduser.o: ../../../pikotools/space/space.h +adduser.o: ../../../pikotools/textstream/types.h +adduser.o: ../../../pikotools/date/date.h +adduser.o: ../../../pikotools/convert/inttostr.h adduser.o: ../../../pikotools/membuffer/membuffer.h adduser.o: ../../../pikotools/textstream/types.h adduser.o: ../../../pikotools/utf8/utf8.h @@ -160,6 +161,16 @@ adduser.o: ../../../winix/winixd/core/user.h adduser.o: ../../../winix/winixd/core/group.h adduser.o: ../../../winix/winixd/core/dircontainer.h adduser.o: ../../../winix/winixd/core/winixbase.h +adduser.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +adduser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +adduser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +adduser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +adduser.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +adduser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +adduser.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +adduser.o: ../../../morm/src/fieldvaluehelper.h +adduser.o: ../../../morm/src/flatexpression.h +adduser.o: ../../../winix/winixd/models/itemcontent.h adduser.o: ../../../winix/winixd/core/ugcontainer.h adduser.o: ../../../winix/winixd/core/request.h adduser.o: ../../../winix/winixd/core/error.h @@ -174,16 +185,8 @@ adduser.o: ../../../winix/winixd/core/winixmodel.h adduser.o: ../../../winix/winixd/core/plugin.h adduser.o: ../../../winix/winixd/core/pluginmsg.h adduser.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -adduser.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -adduser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -adduser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -adduser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -adduser.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -adduser.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -adduser.o: ../../../morm/src/finderhelper.h -adduser.o: ../../../morm/src/fieldvaluehelper.h -adduser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -adduser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +adduser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +adduser.o: ../../../morm/src/jsonexpression.h adduser.o: ../../../morm/src/postgresqlexpression.h adduser.o: ../../../morm/src/jsonconnector.h adduser.o: ../../../morm/src/postgresqlconnector.h @@ -213,8 +216,9 @@ adduser.o: ../../../pikotools/convert/patternreplacer.h adduser.o: ../../../winix/winixd/templates/patterns.h locale.h adduser.o: ../../../winix/winixd/templates/localefilter.h adduser.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -adduser.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -adduser.o: functionparser.h ../../../winix/winixd/core/cur.h +adduser.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +adduser.o: ../../../ezc/src/cache.h functions.h functionparser.h +adduser.o: ../../../winix/winixd/core/cur.h adduser.o: ../../../winix/winixd/core/winixmodel.h account.h cat.h chmod.h adduser.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h adduser.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -240,16 +244,15 @@ adduser.o: ../../../winix/winixd/core/users.h adduser.o: ../../../winix/winixd/core/timezones.h adduser.o: ../../../winix/winixd/core/misc.h adduser.o: ../../../winix/winixd/functions/functions.h -cat.o: cat.h functionbase.h ../../../winix/winixd/core/item.h -cat.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -cat.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -cat.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -cat.o: ../../../winix/winixd/db/dbconn.h +cat.o: cat.h functionbase.h ../../../winix/winixd/db/db.h +cat.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h cat.o: ../../../winix/winixd/db/dbtextstream.h cat.o: ../../../winix/winixd/core/textstream.h -cat.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +cat.o: ../../../winix/winixd/core/misc.h cat.o: ../../../winix/winixd/core/requesttypes.h cat.o: ../../../pikotools/textstream/textstream.h +cat.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +cat.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h cat.o: ../../../pikotools/membuffer/membuffer.h cat.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h cat.o: ../../../winix/winixd/core/winix_const.h @@ -273,6 +276,16 @@ cat.o: ../../../winix/winixd/db/dbitemcolumns.h cat.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h cat.o: ../../../winix/winixd/core/dircontainer.h cat.o: ../../../winix/winixd/core/winixbase.h +cat.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +cat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +cat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +cat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +cat.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +cat.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +cat.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +cat.o: ../../../morm/src/fieldvaluehelper.h +cat.o: ../../../morm/src/flatexpression.h +cat.o: ../../../winix/winixd/models/itemcontent.h cat.o: ../../../winix/winixd/core/ugcontainer.h cat.o: ../../../winix/winixd/core/request.h cat.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h @@ -285,15 +298,8 @@ cat.o: ../../../winix/winixd/core/winixmodel.h cat.o: ../../../winix/winixd/core/plugin.h cat.o: ../../../winix/winixd/core/pluginmsg.h cat.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -cat.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -cat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -cat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -cat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -cat.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -cat.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -cat.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -cat.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -cat.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +cat.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +cat.o: ../../../morm/src/jsonexpression.h cat.o: ../../../morm/src/postgresqlexpression.h cat.o: ../../../morm/src/jsonconnector.h cat.o: ../../../morm/src/postgresqlconnector.h @@ -320,8 +326,8 @@ cat.o: ../../../pikotools/convert/patternreplacer.h cat.o: ../../../winix/winixd/templates/patterns.h locale.h cat.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h cat.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -cat.o: ../../../ezc/src/cache.h functions.h functionparser.h -cat.o: ../../../winix/winixd/core/cur.h +cat.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +cat.o: functionparser.h ../../../winix/winixd/core/cur.h cat.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h chmod.h cat.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h cat.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h @@ -345,16 +351,16 @@ cat.o: ../../../winix/winixd/core/basethread.h cat.o: ../../../winix/winixd/notify/templatesnotify.h cat.o: ../../../winix/winixd/core/users.h cat.o: ../../../winix/winixd/core/timezones.h -chmod.o: chmod.h functionbase.h ../../../winix/winixd/core/item.h -chmod.o: ../../../pikotools/space/space.h -chmod.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -chmod.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +chmod.o: chmod.h functionbase.h ../../../winix/winixd/db/db.h chmod.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h chmod.o: ../../../winix/winixd/db/dbtextstream.h chmod.o: ../../../winix/winixd/core/textstream.h -chmod.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +chmod.o: ../../../winix/winixd/core/misc.h chmod.o: ../../../winix/winixd/core/requesttypes.h chmod.o: ../../../pikotools/textstream/textstream.h +chmod.o: ../../../pikotools/space/space.h +chmod.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +chmod.o: ../../../pikotools/convert/inttostr.h chmod.o: ../../../pikotools/membuffer/membuffer.h chmod.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h chmod.o: ../../../winix/winixd/core/winix_const.h @@ -380,6 +386,16 @@ chmod.o: ../../../winix/winixd/db/dbitemcolumns.h chmod.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h chmod.o: ../../../winix/winixd/core/dircontainer.h chmod.o: ../../../winix/winixd/core/winixbase.h +chmod.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +chmod.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +chmod.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +chmod.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +chmod.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +chmod.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +chmod.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +chmod.o: ../../../morm/src/fieldvaluehelper.h +chmod.o: ../../../morm/src/flatexpression.h +chmod.o: ../../../winix/winixd/models/itemcontent.h chmod.o: ../../../winix/winixd/core/ugcontainer.h chmod.o: ../../../winix/winixd/core/request.h chmod.o: ../../../winix/winixd/core/error.h @@ -393,16 +409,8 @@ chmod.o: ../../../winix/winixd/core/winixmodel.h chmod.o: ../../../winix/winixd/core/plugin.h chmod.o: ../../../winix/winixd/core/pluginmsg.h chmod.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -chmod.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -chmod.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -chmod.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -chmod.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -chmod.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -chmod.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -chmod.o: ../../../morm/src/finderhelper.h -chmod.o: ../../../morm/src/fieldvaluehelper.h -chmod.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -chmod.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +chmod.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +chmod.o: ../../../morm/src/jsonexpression.h chmod.o: ../../../morm/src/postgresqlexpression.h chmod.o: ../../../morm/src/jsonconnector.h chmod.o: ../../../morm/src/postgresqlconnector.h @@ -431,8 +439,9 @@ chmod.o: ../../../pikotools/convert/patternreplacer.h chmod.o: ../../../winix/winixd/templates/patterns.h locale.h chmod.o: ../../../winix/winixd/templates/localefilter.h chmod.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -chmod.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -chmod.o: functionparser.h ../../../winix/winixd/core/cur.h +chmod.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +chmod.o: ../../../ezc/src/cache.h functions.h functionparser.h +chmod.o: ../../../winix/winixd/core/cur.h chmod.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h chmod.o: chown.h privchanger.h ckeditor.h cp.h default.h download.h emacs.h chmod.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -456,16 +465,16 @@ chmod.o: ../../../winix/winixd/core/basethread.h chmod.o: ../../../winix/winixd/notify/templatesnotify.h chmod.o: ../../../winix/winixd/core/users.h chmod.o: ../../../winix/winixd/core/timezones.h -chown.o: chown.h functionbase.h ../../../winix/winixd/core/item.h -chown.o: ../../../pikotools/space/space.h -chown.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -chown.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +chown.o: chown.h functionbase.h ../../../winix/winixd/db/db.h chown.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h chown.o: ../../../winix/winixd/db/dbtextstream.h chown.o: ../../../winix/winixd/core/textstream.h -chown.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +chown.o: ../../../winix/winixd/core/misc.h chown.o: ../../../winix/winixd/core/requesttypes.h chown.o: ../../../pikotools/textstream/textstream.h +chown.o: ../../../pikotools/space/space.h +chown.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +chown.o: ../../../pikotools/convert/inttostr.h chown.o: ../../../pikotools/membuffer/membuffer.h chown.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h chown.o: ../../../winix/winixd/core/winix_const.h @@ -491,6 +500,16 @@ chown.o: ../../../winix/winixd/db/dbitemcolumns.h chown.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h chown.o: ../../../winix/winixd/core/dircontainer.h chown.o: ../../../winix/winixd/core/winixbase.h +chown.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +chown.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +chown.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +chown.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +chown.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +chown.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +chown.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +chown.o: ../../../morm/src/fieldvaluehelper.h +chown.o: ../../../morm/src/flatexpression.h +chown.o: ../../../winix/winixd/models/itemcontent.h chown.o: ../../../winix/winixd/core/ugcontainer.h chown.o: ../../../winix/winixd/core/request.h chown.o: ../../../winix/winixd/core/error.h @@ -504,16 +523,8 @@ chown.o: ../../../winix/winixd/core/winixmodel.h chown.o: ../../../winix/winixd/core/plugin.h chown.o: ../../../winix/winixd/core/pluginmsg.h chown.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -chown.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -chown.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -chown.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -chown.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -chown.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -chown.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -chown.o: ../../../morm/src/finderhelper.h -chown.o: ../../../morm/src/fieldvaluehelper.h -chown.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -chown.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +chown.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +chown.o: ../../../morm/src/jsonexpression.h chown.o: ../../../morm/src/postgresqlexpression.h chown.o: ../../../morm/src/jsonconnector.h chown.o: ../../../morm/src/postgresqlconnector.h @@ -542,8 +553,9 @@ chown.o: ../../../pikotools/convert/patternreplacer.h chown.o: ../../../winix/winixd/templates/patterns.h locale.h chown.o: ../../../winix/winixd/templates/localefilter.h chown.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -chown.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -chown.o: functionparser.h ../../../winix/winixd/core/cur.h +chown.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +chown.o: ../../../ezc/src/cache.h functions.h functionparser.h +chown.o: ../../../winix/winixd/core/cur.h chown.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h chown.o: chmod.h privchanger.h ckeditor.h cp.h default.h download.h emacs.h chown.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -567,19 +579,18 @@ chown.o: ../../../winix/winixd/core/basethread.h chown.o: ../../../winix/winixd/notify/templatesnotify.h chown.o: ../../../winix/winixd/core/users.h chown.o: ../../../winix/winixd/core/timezones.h -ckeditor.o: ckeditor.h functionbase.h ../../../winix/winixd/core/item.h -ckeditor.o: ../../../pikotools/space/space.h -ckeditor.o: ../../../pikotools/textstream/types.h -ckeditor.o: ../../../pikotools/date/date.h -ckeditor.o: ../../../pikotools/convert/inttostr.h -ckeditor.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +ckeditor.o: ckeditor.h functionbase.h ../../../winix/winixd/db/db.h +ckeditor.o: ../../../winix/winixd/db/dbbase.h ckeditor.o: ../../../winix/winixd/db/dbconn.h ckeditor.o: ../../../winix/winixd/db/dbtextstream.h ckeditor.o: ../../../winix/winixd/core/textstream.h ckeditor.o: ../../../winix/winixd/core/misc.h -ckeditor.o: ../../../winix/winixd/core/item.h ckeditor.o: ../../../winix/winixd/core/requesttypes.h ckeditor.o: ../../../pikotools/textstream/textstream.h +ckeditor.o: ../../../pikotools/space/space.h +ckeditor.o: ../../../pikotools/textstream/types.h +ckeditor.o: ../../../pikotools/date/date.h +ckeditor.o: ../../../pikotools/convert/inttostr.h ckeditor.o: ../../../pikotools/membuffer/membuffer.h ckeditor.o: ../../../pikotools/textstream/types.h ckeditor.o: ../../../pikotools/utf8/utf8.h @@ -607,6 +618,17 @@ ckeditor.o: ../../../winix/winixd/core/user.h ckeditor.o: ../../../winix/winixd/core/group.h ckeditor.o: ../../../winix/winixd/core/dircontainer.h ckeditor.o: ../../../winix/winixd/core/winixbase.h +ckeditor.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +ckeditor.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +ckeditor.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +ckeditor.o: ../../../morm/src/flatconnector.h +ckeditor.o: ../../../morm/src/dbexpression.h +ckeditor.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +ckeditor.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +ckeditor.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +ckeditor.o: ../../../morm/src/fieldvaluehelper.h +ckeditor.o: ../../../morm/src/flatexpression.h +ckeditor.o: ../../../winix/winixd/models/itemcontent.h ckeditor.o: ../../../winix/winixd/core/ugcontainer.h ckeditor.o: ../../../winix/winixd/core/request.h ckeditor.o: ../../../winix/winixd/core/error.h @@ -621,17 +643,8 @@ ckeditor.o: ../../../winix/winixd/core/winixmodel.h ckeditor.o: ../../../winix/winixd/core/plugin.h ckeditor.o: ../../../winix/winixd/core/pluginmsg.h ckeditor.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -ckeditor.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -ckeditor.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -ckeditor.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -ckeditor.o: ../../../morm/src/flatconnector.h -ckeditor.o: ../../../morm/src/dbexpression.h -ckeditor.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -ckeditor.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -ckeditor.o: ../../../morm/src/finderhelper.h -ckeditor.o: ../../../morm/src/fieldvaluehelper.h -ckeditor.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -ckeditor.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +ckeditor.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +ckeditor.o: ../../../morm/src/jsonexpression.h ckeditor.o: ../../../morm/src/postgresqlexpression.h ckeditor.o: ../../../morm/src/jsonconnector.h ckeditor.o: ../../../morm/src/postgresqlconnector.h @@ -661,8 +674,9 @@ ckeditor.o: ../../../pikotools/convert/patternreplacer.h ckeditor.o: ../../../winix/winixd/templates/patterns.h locale.h ckeditor.o: ../../../winix/winixd/templates/localefilter.h ckeditor.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -ckeditor.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -ckeditor.o: functionparser.h ../../../winix/winixd/core/cur.h +ckeditor.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +ckeditor.o: ../../../ezc/src/cache.h functions.h functionparser.h +ckeditor.o: ../../../winix/winixd/core/cur.h ckeditor.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h ckeditor.o: chmod.h privchanger.h chown.h cp.h default.h download.h emacs.h ckeditor.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -686,16 +700,15 @@ ckeditor.o: ../../../winix/winixd/core/basethread.h ckeditor.o: ../../../winix/winixd/notify/templatesnotify.h ckeditor.o: ../../../winix/winixd/core/users.h ckeditor.o: ../../../winix/winixd/core/timezones.h -cp.o: cp.h functionbase.h ../../../winix/winixd/core/item.h -cp.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -cp.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -cp.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -cp.o: ../../../winix/winixd/db/dbconn.h +cp.o: cp.h functionbase.h ../../../winix/winixd/db/db.h +cp.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h cp.o: ../../../winix/winixd/db/dbtextstream.h cp.o: ../../../winix/winixd/core/textstream.h -cp.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +cp.o: ../../../winix/winixd/core/misc.h cp.o: ../../../winix/winixd/core/requesttypes.h cp.o: ../../../pikotools/textstream/textstream.h +cp.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +cp.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h cp.o: ../../../pikotools/membuffer/membuffer.h cp.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h cp.o: ../../../winix/winixd/core/winix_const.h @@ -717,6 +730,15 @@ cp.o: ../../../winix/winixd/db/dbitemcolumns.h cp.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h cp.o: ../../../winix/winixd/core/dircontainer.h cp.o: ../../../winix/winixd/core/winixbase.h +cp.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +cp.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +cp.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +cp.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +cp.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +cp.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +cp.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +cp.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/flatexpression.h +cp.o: ../../../winix/winixd/models/itemcontent.h cp.o: ../../../winix/winixd/core/ugcontainer.h cp.o: ../../../winix/winixd/core/request.h ../../../winix/winixd/core/error.h cp.o: ../../../winix/winixd/core/config.h @@ -729,15 +751,8 @@ cp.o: ../../../winix/winixd/core/winixmodel.h cp.o: ../../../winix/winixd/core/plugin.h cp.o: ../../../winix/winixd/core/pluginmsg.h cp.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -cp.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -cp.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -cp.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -cp.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -cp.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -cp.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -cp.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -cp.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -cp.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +cp.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +cp.o: ../../../morm/src/jsonexpression.h cp.o: ../../../morm/src/postgresqlexpression.h cp.o: ../../../morm/src/jsonconnector.h cp.o: ../../../morm/src/postgresqlconnector.h @@ -763,8 +778,8 @@ cp.o: ../../../pikotools/convert/patternreplacer.h cp.o: ../../../winix/winixd/templates/patterns.h locale.h cp.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h cp.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -cp.o: ../../../ezc/src/cache.h functions.h functionparser.h -cp.o: ../../../winix/winixd/core/cur.h +cp.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +cp.o: functionparser.h ../../../winix/winixd/core/cur.h cp.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h cp.o: chmod.h privchanger.h chown.h ckeditor.h default.h download.h emacs.h cp.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h @@ -789,19 +804,18 @@ cp.o: ../../../winix/winixd/notify/templatesnotify.h cp.o: ../../../winix/winixd/core/users.h cp.o: ../../../winix/winixd/core/timezones.h cp.o: ../../../winix/winixd/core/misc.h -default.o: default.h functionbase.h ../../../winix/winixd/core/item.h -default.o: ../../../pikotools/space/space.h -default.o: ../../../pikotools/textstream/types.h -default.o: ../../../pikotools/date/date.h -default.o: ../../../pikotools/convert/inttostr.h -default.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +default.o: default.h functionbase.h ../../../winix/winixd/db/db.h +default.o: ../../../winix/winixd/db/dbbase.h default.o: ../../../winix/winixd/db/dbconn.h default.o: ../../../winix/winixd/db/dbtextstream.h default.o: ../../../winix/winixd/core/textstream.h default.o: ../../../winix/winixd/core/misc.h -default.o: ../../../winix/winixd/core/item.h default.o: ../../../winix/winixd/core/requesttypes.h default.o: ../../../pikotools/textstream/textstream.h +default.o: ../../../pikotools/space/space.h +default.o: ../../../pikotools/textstream/types.h +default.o: ../../../pikotools/date/date.h +default.o: ../../../pikotools/convert/inttostr.h default.o: ../../../pikotools/membuffer/membuffer.h default.o: ../../../pikotools/textstream/types.h default.o: ../../../pikotools/utf8/utf8.h @@ -829,6 +843,16 @@ default.o: ../../../winix/winixd/core/user.h default.o: ../../../winix/winixd/core/group.h default.o: ../../../winix/winixd/core/dircontainer.h default.o: ../../../winix/winixd/core/winixbase.h +default.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +default.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +default.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +default.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +default.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +default.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +default.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +default.o: ../../../morm/src/fieldvaluehelper.h +default.o: ../../../morm/src/flatexpression.h +default.o: ../../../winix/winixd/models/itemcontent.h default.o: ../../../winix/winixd/core/ugcontainer.h default.o: ../../../winix/winixd/core/request.h default.o: ../../../winix/winixd/core/error.h @@ -843,16 +867,8 @@ default.o: ../../../winix/winixd/core/winixmodel.h default.o: ../../../winix/winixd/core/plugin.h default.o: ../../../winix/winixd/core/pluginmsg.h default.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -default.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -default.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -default.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -default.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -default.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -default.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -default.o: ../../../morm/src/finderhelper.h -default.o: ../../../morm/src/fieldvaluehelper.h -default.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -default.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +default.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +default.o: ../../../morm/src/jsonexpression.h default.o: ../../../morm/src/postgresqlexpression.h default.o: ../../../morm/src/jsonconnector.h default.o: ../../../morm/src/postgresqlconnector.h @@ -882,8 +898,9 @@ default.o: ../../../pikotools/convert/patternreplacer.h default.o: ../../../winix/winixd/templates/patterns.h locale.h default.o: ../../../winix/winixd/templates/localefilter.h default.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -default.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -default.o: functionparser.h ../../../winix/winixd/core/cur.h +default.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +default.o: ../../../ezc/src/cache.h functions.h functionparser.h +default.o: ../../../winix/winixd/core/cur.h default.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h default.o: chmod.h privchanger.h chown.h ckeditor.h cp.h download.h emacs.h default.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -907,19 +924,18 @@ default.o: ../../../winix/winixd/core/basethread.h default.o: ../../../winix/winixd/notify/templatesnotify.h default.o: ../../../winix/winixd/core/users.h default.o: ../../../winix/winixd/core/timezones.h -download.o: download.h functionbase.h ../../../winix/winixd/core/item.h -download.o: ../../../pikotools/space/space.h -download.o: ../../../pikotools/textstream/types.h -download.o: ../../../pikotools/date/date.h -download.o: ../../../pikotools/convert/inttostr.h -download.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +download.o: download.h functionbase.h ../../../winix/winixd/db/db.h +download.o: ../../../winix/winixd/db/dbbase.h download.o: ../../../winix/winixd/db/dbconn.h download.o: ../../../winix/winixd/db/dbtextstream.h download.o: ../../../winix/winixd/core/textstream.h download.o: ../../../winix/winixd/core/misc.h -download.o: ../../../winix/winixd/core/item.h download.o: ../../../winix/winixd/core/requesttypes.h download.o: ../../../pikotools/textstream/textstream.h +download.o: ../../../pikotools/space/space.h +download.o: ../../../pikotools/textstream/types.h +download.o: ../../../pikotools/date/date.h +download.o: ../../../pikotools/convert/inttostr.h download.o: ../../../pikotools/membuffer/membuffer.h download.o: ../../../pikotools/textstream/types.h download.o: ../../../pikotools/utf8/utf8.h @@ -947,6 +963,17 @@ download.o: ../../../winix/winixd/core/user.h download.o: ../../../winix/winixd/core/group.h download.o: ../../../winix/winixd/core/dircontainer.h download.o: ../../../winix/winixd/core/winixbase.h +download.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +download.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +download.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +download.o: ../../../morm/src/flatconnector.h +download.o: ../../../morm/src/dbexpression.h +download.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +download.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +download.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +download.o: ../../../morm/src/fieldvaluehelper.h +download.o: ../../../morm/src/flatexpression.h +download.o: ../../../winix/winixd/models/itemcontent.h download.o: ../../../winix/winixd/core/ugcontainer.h download.o: ../../../winix/winixd/core/request.h download.o: ../../../winix/winixd/core/error.h @@ -961,17 +988,8 @@ download.o: ../../../winix/winixd/core/winixmodel.h download.o: ../../../winix/winixd/core/plugin.h download.o: ../../../winix/winixd/core/pluginmsg.h download.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -download.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -download.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -download.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -download.o: ../../../morm/src/flatconnector.h -download.o: ../../../morm/src/dbexpression.h -download.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -download.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -download.o: ../../../morm/src/finderhelper.h -download.o: ../../../morm/src/fieldvaluehelper.h -download.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -download.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +download.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +download.o: ../../../morm/src/jsonexpression.h download.o: ../../../morm/src/postgresqlexpression.h download.o: ../../../morm/src/jsonconnector.h download.o: ../../../morm/src/postgresqlconnector.h @@ -1001,8 +1019,9 @@ download.o: ../../../pikotools/convert/patternreplacer.h download.o: ../../../winix/winixd/templates/patterns.h locale.h download.o: ../../../winix/winixd/templates/localefilter.h download.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -download.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -download.o: functionparser.h ../../../winix/winixd/core/cur.h +download.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +download.o: ../../../ezc/src/cache.h functions.h functionparser.h +download.o: ../../../winix/winixd/core/cur.h download.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h download.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h emacs.h download.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -1026,16 +1045,16 @@ download.o: ../../../winix/winixd/core/basethread.h download.o: ../../../winix/winixd/notify/templatesnotify.h download.o: ../../../winix/winixd/core/users.h download.o: ../../../winix/winixd/core/timezones.h -emacs.o: emacs.h functionbase.h ../../../winix/winixd/core/item.h -emacs.o: ../../../pikotools/space/space.h -emacs.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -emacs.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +emacs.o: emacs.h functionbase.h ../../../winix/winixd/db/db.h emacs.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h emacs.o: ../../../winix/winixd/db/dbtextstream.h emacs.o: ../../../winix/winixd/core/textstream.h -emacs.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +emacs.o: ../../../winix/winixd/core/misc.h emacs.o: ../../../winix/winixd/core/requesttypes.h emacs.o: ../../../pikotools/textstream/textstream.h +emacs.o: ../../../pikotools/space/space.h +emacs.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +emacs.o: ../../../pikotools/convert/inttostr.h emacs.o: ../../../pikotools/membuffer/membuffer.h emacs.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h emacs.o: ../../../winix/winixd/core/winix_const.h @@ -1061,6 +1080,16 @@ emacs.o: ../../../winix/winixd/db/dbitemcolumns.h emacs.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h emacs.o: ../../../winix/winixd/core/dircontainer.h emacs.o: ../../../winix/winixd/core/winixbase.h +emacs.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +emacs.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +emacs.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +emacs.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +emacs.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +emacs.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +emacs.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +emacs.o: ../../../morm/src/fieldvaluehelper.h +emacs.o: ../../../morm/src/flatexpression.h +emacs.o: ../../../winix/winixd/models/itemcontent.h emacs.o: ../../../winix/winixd/core/ugcontainer.h emacs.o: ../../../winix/winixd/core/request.h emacs.o: ../../../winix/winixd/core/error.h @@ -1074,16 +1103,8 @@ emacs.o: ../../../winix/winixd/core/winixmodel.h emacs.o: ../../../winix/winixd/core/plugin.h emacs.o: ../../../winix/winixd/core/pluginmsg.h emacs.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -emacs.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -emacs.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -emacs.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -emacs.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -emacs.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -emacs.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -emacs.o: ../../../morm/src/finderhelper.h -emacs.o: ../../../morm/src/fieldvaluehelper.h -emacs.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -emacs.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +emacs.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +emacs.o: ../../../morm/src/jsonexpression.h emacs.o: ../../../morm/src/postgresqlexpression.h emacs.o: ../../../morm/src/jsonconnector.h emacs.o: ../../../morm/src/postgresqlconnector.h @@ -1112,8 +1133,9 @@ emacs.o: ../../../pikotools/convert/patternreplacer.h emacs.o: ../../../winix/winixd/templates/patterns.h locale.h emacs.o: ../../../winix/winixd/templates/localefilter.h emacs.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -emacs.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -emacs.o: functionparser.h ../../../winix/winixd/core/cur.h +emacs.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +emacs.o: ../../../ezc/src/cache.h functions.h functionparser.h +emacs.o: ../../../winix/winixd/core/cur.h emacs.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h emacs.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -1143,16 +1165,15 @@ emacs.o: ../../../winix/winixd/templates/indexpatterns.h emacs.o: ../../../winix/winixd/templates/patterns.h emacs.o: ../../../winix/winixd/templates/changepatterns.h emacs.o: ../../../winix/winixd/templates/htmltextstream.h -env.o: env.h functionbase.h ../../../winix/winixd/core/item.h -env.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -env.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -env.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -env.o: ../../../winix/winixd/db/dbconn.h +env.o: env.h functionbase.h ../../../winix/winixd/db/db.h +env.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h env.o: ../../../winix/winixd/db/dbtextstream.h env.o: ../../../winix/winixd/core/textstream.h -env.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +env.o: ../../../winix/winixd/core/misc.h env.o: ../../../winix/winixd/core/requesttypes.h env.o: ../../../pikotools/textstream/textstream.h +env.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +env.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h env.o: ../../../pikotools/membuffer/membuffer.h env.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h env.o: ../../../winix/winixd/core/winix_const.h @@ -1176,6 +1197,16 @@ env.o: ../../../winix/winixd/db/dbitemcolumns.h env.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h env.o: ../../../winix/winixd/core/dircontainer.h env.o: ../../../winix/winixd/core/winixbase.h +env.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +env.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +env.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +env.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +env.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +env.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +env.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +env.o: ../../../morm/src/fieldvaluehelper.h +env.o: ../../../morm/src/flatexpression.h +env.o: ../../../winix/winixd/models/itemcontent.h env.o: ../../../winix/winixd/core/ugcontainer.h env.o: ../../../winix/winixd/core/request.h env.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h @@ -1188,15 +1219,8 @@ env.o: ../../../winix/winixd/core/winixmodel.h env.o: ../../../winix/winixd/core/plugin.h env.o: ../../../winix/winixd/core/pluginmsg.h env.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -env.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -env.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -env.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -env.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -env.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -env.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -env.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -env.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -env.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +env.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +env.o: ../../../morm/src/jsonexpression.h env.o: ../../../morm/src/postgresqlexpression.h env.o: ../../../morm/src/jsonconnector.h env.o: ../../../morm/src/postgresqlconnector.h @@ -1223,8 +1247,8 @@ env.o: ../../../pikotools/convert/patternreplacer.h env.o: ../../../winix/winixd/templates/patterns.h locale.h env.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h env.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -env.o: ../../../ezc/src/cache.h functions.h functionparser.h -env.o: ../../../winix/winixd/core/cur.h +env.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +env.o: functionparser.h ../../../winix/winixd/core/cur.h env.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h env.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h env.o: emacs.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -1248,20 +1272,18 @@ env.o: ../../../winix/winixd/core/basethread.h env.o: ../../../winix/winixd/notify/templatesnotify.h env.o: ../../../winix/winixd/core/users.h env.o: ../../../winix/winixd/core/timezones.h -functionbase.o: functionbase.h ../../../winix/winixd/core/item.h -functionbase.o: ../../../pikotools/space/space.h -functionbase.o: ../../../pikotools/textstream/types.h -functionbase.o: ../../../pikotools/date/date.h -functionbase.o: ../../../pikotools/convert/inttostr.h -functionbase.o: ../../../winix/winixd/db/db.h +functionbase.o: functionbase.h ../../../winix/winixd/db/db.h functionbase.o: ../../../winix/winixd/db/dbbase.h functionbase.o: ../../../winix/winixd/db/dbconn.h functionbase.o: ../../../winix/winixd/db/dbtextstream.h functionbase.o: ../../../winix/winixd/core/textstream.h functionbase.o: ../../../winix/winixd/core/misc.h -functionbase.o: ../../../winix/winixd/core/item.h functionbase.o: ../../../winix/winixd/core/requesttypes.h functionbase.o: ../../../pikotools/textstream/textstream.h +functionbase.o: ../../../pikotools/space/space.h +functionbase.o: ../../../pikotools/textstream/types.h +functionbase.o: ../../../pikotools/date/date.h +functionbase.o: ../../../pikotools/convert/inttostr.h functionbase.o: ../../../pikotools/membuffer/membuffer.h functionbase.o: ../../../pikotools/textstream/types.h functionbase.o: ../../../pikotools/utf8/utf8.h @@ -1290,6 +1312,20 @@ functionbase.o: ../../../winix/winixd/core/user.h functionbase.o: ../../../winix/winixd/core/group.h functionbase.o: ../../../winix/winixd/core/dircontainer.h functionbase.o: ../../../winix/winixd/core/winixbase.h +functionbase.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +functionbase.o: ../../../morm/src/modelconnector.h +functionbase.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h +functionbase.o: ../../../morm/src/queryresult.h +functionbase.o: ../../../morm/src/flatconnector.h +functionbase.o: ../../../morm/src/dbexpression.h +functionbase.o: ../../../morm/src/baseexpression.h +functionbase.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +functionbase.o: ../../../morm/src/modeldata.h +functionbase.o: ../../../morm/src/cursorhelper.h +functionbase.o: ../../../morm/src/finderhelper.h +functionbase.o: ../../../morm/src/fieldvaluehelper.h +functionbase.o: ../../../morm/src/flatexpression.h +functionbase.o: ../../../winix/winixd/models/itemcontent.h functionbase.o: ../../../winix/winixd/core/ugcontainer.h functionbase.o: ../../../winix/winixd/core/request.h functionbase.o: ../../../winix/winixd/core/error.h @@ -1305,18 +1341,7 @@ functionbase.o: ../../../winix/winixd/core/winixmodel.h functionbase.o: ../../../winix/winixd/core/plugin.h functionbase.o: ../../../winix/winixd/core/pluginmsg.h functionbase.o: ../../../winix/winixd/core/plugindata.h -functionbase.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -functionbase.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -functionbase.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -functionbase.o: ../../../morm/src/queryresult.h -functionbase.o: ../../../morm/src/flatconnector.h -functionbase.o: ../../../morm/src/dbexpression.h -functionbase.o: ../../../morm/src/baseexpression.h -functionbase.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -functionbase.o: ../../../morm/src/cursorhelper.h -functionbase.o: ../../../morm/src/finderhelper.h -functionbase.o: ../../../morm/src/fieldvaluehelper.h -functionbase.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h +functionbase.o: ../../../morm/src/morm.h ../../../morm/src/finder.h functionbase.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h functionbase.o: ../../../morm/src/postgresqlexpression.h functionbase.o: ../../../morm/src/jsonconnector.h @@ -1347,8 +1372,9 @@ functionbase.o: ../../../pikotools/convert/patternreplacer.h functionbase.o: ../../../winix/winixd/templates/patterns.h locale.h functionbase.o: ../../../winix/winixd/templates/localefilter.h functionbase.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -functionbase.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h -functionbase.o: functions.h functionparser.h ../../../winix/winixd/core/cur.h +functionbase.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +functionbase.o: ../../../ezc/src/cache.h functions.h functionparser.h +functionbase.o: ../../../winix/winixd/core/cur.h functionbase.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h functionbase.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h functionbase.o: download.h emacs.h env.h imgcrop.h last.h login.h logout.h @@ -1380,7 +1406,6 @@ functionparser.o: ../../../winix/winixd/db/dbconn.h functionparser.o: ../../../winix/winixd/db/dbtextstream.h functionparser.o: ../../../winix/winixd/core/textstream.h functionparser.o: ../../../winix/winixd/core/misc.h -functionparser.o: ../../../winix/winixd/core/item.h functionparser.o: ../../../winix/winixd/core/requesttypes.h functionparser.o: ../../../pikotools/textstream/textstream.h functionparser.o: ../../../pikotools/space/space.h @@ -1411,12 +1436,26 @@ functionparser.o: ../../../winix/winixd/core/lock.h functionparser.o: ../../../winix/winixd/core/synchro.h functionparser.o: ../../../winix/winixd/core/error.h functionparser.o: ../../../winix/winixd/db/dbitemquery.h -functionparser.o: ../../../winix/winixd/core/item.h functionparser.o: ../../../winix/winixd/db/dbitemcolumns.h functionparser.o: ../../../winix/winixd/core/user.h functionparser.o: ../../../winix/winixd/core/group.h functionparser.o: ../../../winix/winixd/core/dircontainer.h functionparser.o: ../../../winix/winixd/core/winixbase.h +functionparser.o: ../../../winix/winixd/models/item.h +functionparser.o: ../../../morm/src/model.h +functionparser.o: ../../../morm/src/modelconnector.h +functionparser.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h +functionparser.o: ../../../morm/src/queryresult.h +functionparser.o: ../../../morm/src/flatconnector.h +functionparser.o: ../../../morm/src/dbexpression.h +functionparser.o: ../../../morm/src/baseexpression.h +functionparser.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +functionparser.o: ../../../morm/src/modeldata.h +functionparser.o: ../../../morm/src/cursorhelper.h +functionparser.o: ../../../morm/src/finderhelper.h +functionparser.o: ../../../morm/src/fieldvaluehelper.h +functionparser.o: ../../../morm/src/flatexpression.h +functionparser.o: ../../../winix/winixd/models/itemcontent.h functionparser.o: ../../../winix/winixd/core/ugcontainer.h functionparser.o: ../../../winix/winixd/core/cur.h functionparser.o: ../../../winix/winixd/core/system.h @@ -1426,20 +1465,8 @@ functionparser.o: ../../../winix/winixd/core/winixmodel.h functionparser.o: ../../../winix/winixd/core/plugin.h functionparser.o: ../../../winix/winixd/core/pluginmsg.h functionparser.o: ../../../winix/winixd/core/plugindata.h -functionparser.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -functionparser.o: ../../../morm/src/model.h -functionparser.o: ../../../morm/src/modelconnector.h -functionparser.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -functionparser.o: ../../../morm/src/queryresult.h -functionparser.o: ../../../morm/src/flatconnector.h -functionparser.o: ../../../morm/src/dbexpression.h -functionparser.o: ../../../morm/src/baseexpression.h -functionparser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -functionparser.o: ../../../morm/src/cursorhelper.h -functionparser.o: ../../../morm/src/finderhelper.h -functionparser.o: ../../../morm/src/fieldvaluehelper.h -functionparser.o: ../../../morm/src/flatexpression.h -functionparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +functionparser.o: ../../../morm/src/morm.h ../../../morm/src/finder.h +functionparser.o: ../../../morm/src/cursor.h functionparser.o: ../../../morm/src/jsonexpression.h functionparser.o: ../../../morm/src/postgresqlexpression.h functionparser.o: ../../../morm/src/jsonconnector.h @@ -1463,8 +1490,9 @@ functionparser.o: ../../../pikotools/convert/patternreplacer.h functionparser.o: ../../../winix/winixd/templates/patterns.h locale.h functionparser.o: ../../../winix/winixd/templates/localefilter.h functionparser.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -functionparser.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h -functionparser.o: functions.h account.h adduser.h cat.h chmod.h privchanger.h +functionparser.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +functionparser.o: ../../../ezc/src/cache.h functions.h account.h adduser.h +functionparser.o: cat.h chmod.h privchanger.h functionparser.o: ../../../winix/winixd/core/winixmodel.h chown.h ckeditor.h functionparser.o: cp.h default.h download.h emacs.h env.h imgcrop.h last.h functionparser.o: login.h logout.h ln.h ls.h ipban.h man.h meta.h mkdir.h @@ -1503,19 +1531,18 @@ functionparser.o: ../../../winix/winixd/core/loadavg.h functionparser.o: ../../../winix/winixd/core/image.h functionparser.o: ../../../winix/winixd/core/threadmanager.h functionparser.o: ../../../winix/winixd/core/timezones.h -functions.o: functions.h functionbase.h ../../../winix/winixd/core/item.h -functions.o: ../../../pikotools/space/space.h -functions.o: ../../../pikotools/textstream/types.h -functions.o: ../../../pikotools/date/date.h -functions.o: ../../../pikotools/convert/inttostr.h -functions.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +functions.o: functions.h functionbase.h ../../../winix/winixd/db/db.h +functions.o: ../../../winix/winixd/db/dbbase.h functions.o: ../../../winix/winixd/db/dbconn.h functions.o: ../../../winix/winixd/db/dbtextstream.h functions.o: ../../../winix/winixd/core/textstream.h functions.o: ../../../winix/winixd/core/misc.h -functions.o: ../../../winix/winixd/core/item.h functions.o: ../../../winix/winixd/core/requesttypes.h functions.o: ../../../pikotools/textstream/textstream.h +functions.o: ../../../pikotools/space/space.h +functions.o: ../../../pikotools/textstream/types.h +functions.o: ../../../pikotools/date/date.h +functions.o: ../../../pikotools/convert/inttostr.h functions.o: ../../../pikotools/membuffer/membuffer.h functions.o: ../../../pikotools/textstream/types.h functions.o: ../../../pikotools/utf8/utf8.h @@ -1544,6 +1571,18 @@ functions.o: ../../../winix/winixd/core/user.h functions.o: ../../../winix/winixd/core/group.h functions.o: ../../../winix/winixd/core/dircontainer.h functions.o: ../../../winix/winixd/core/winixbase.h +functions.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +functions.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +functions.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +functions.o: ../../../morm/src/flatconnector.h +functions.o: ../../../morm/src/dbexpression.h +functions.o: ../../../morm/src/baseexpression.h +functions.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +functions.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +functions.o: ../../../morm/src/finderhelper.h +functions.o: ../../../morm/src/fieldvaluehelper.h +functions.o: ../../../morm/src/flatexpression.h +functions.o: ../../../winix/winixd/models/itemcontent.h functions.o: ../../../winix/winixd/core/ugcontainer.h functions.o: ../../../winix/winixd/core/request.h functions.o: ../../../winix/winixd/core/error.h @@ -1559,17 +1598,8 @@ functions.o: ../../../winix/winixd/core/winixmodel.h functions.o: ../../../winix/winixd/core/plugin.h functions.o: ../../../winix/winixd/core/pluginmsg.h functions.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -functions.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -functions.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -functions.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -functions.o: ../../../morm/src/flatconnector.h -functions.o: ../../../morm/src/dbexpression.h -functions.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -functions.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -functions.o: ../../../morm/src/finderhelper.h -functions.o: ../../../morm/src/fieldvaluehelper.h -functions.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -functions.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +functions.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +functions.o: ../../../morm/src/jsonexpression.h functions.o: ../../../morm/src/postgresqlexpression.h functions.o: ../../../morm/src/jsonconnector.h functions.o: ../../../morm/src/postgresqlconnector.h @@ -1599,9 +1629,9 @@ functions.o: ../../../pikotools/convert/patternreplacer.h functions.o: ../../../winix/winixd/templates/patterns.h locale.h functions.o: ../../../winix/winixd/templates/localefilter.h functions.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -functions.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h -functions.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -functions.o: ../../../ezc/src/expressionparser.h +functions.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +functions.o: ../../../ezc/src/cache.h ../../../ezc/src/objects.h +functions.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h functions.o: ../../../ezc/src/patternparser.h functions.o: ../../../winix/winixd/notify/notifythread.h functions.o: ../../../winix/winixd/core/basethread.h @@ -1633,19 +1663,18 @@ functions.o: ../../../winix/winixd/templates/indexpatterns.h functions.o: ../../../winix/winixd/templates/patterns.h functions.o: ../../../winix/winixd/templates/changepatterns.h functions.o: ../../../winix/winixd/templates/htmltextstream.h -imgcrop.o: imgcrop.h functionbase.h ../../../winix/winixd/core/item.h -imgcrop.o: ../../../pikotools/space/space.h -imgcrop.o: ../../../pikotools/textstream/types.h -imgcrop.o: ../../../pikotools/date/date.h -imgcrop.o: ../../../pikotools/convert/inttostr.h -imgcrop.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +imgcrop.o: imgcrop.h functionbase.h ../../../winix/winixd/db/db.h +imgcrop.o: ../../../winix/winixd/db/dbbase.h imgcrop.o: ../../../winix/winixd/db/dbconn.h imgcrop.o: ../../../winix/winixd/db/dbtextstream.h imgcrop.o: ../../../winix/winixd/core/textstream.h imgcrop.o: ../../../winix/winixd/core/misc.h -imgcrop.o: ../../../winix/winixd/core/item.h imgcrop.o: ../../../winix/winixd/core/requesttypes.h imgcrop.o: ../../../pikotools/textstream/textstream.h +imgcrop.o: ../../../pikotools/space/space.h +imgcrop.o: ../../../pikotools/textstream/types.h +imgcrop.o: ../../../pikotools/date/date.h +imgcrop.o: ../../../pikotools/convert/inttostr.h imgcrop.o: ../../../pikotools/membuffer/membuffer.h imgcrop.o: ../../../pikotools/textstream/types.h imgcrop.o: ../../../pikotools/utf8/utf8.h @@ -1673,6 +1702,16 @@ imgcrop.o: ../../../winix/winixd/core/user.h imgcrop.o: ../../../winix/winixd/core/group.h imgcrop.o: ../../../winix/winixd/core/dircontainer.h imgcrop.o: ../../../winix/winixd/core/winixbase.h +imgcrop.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +imgcrop.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +imgcrop.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +imgcrop.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +imgcrop.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +imgcrop.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +imgcrop.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +imgcrop.o: ../../../morm/src/fieldvaluehelper.h +imgcrop.o: ../../../morm/src/flatexpression.h +imgcrop.o: ../../../winix/winixd/models/itemcontent.h imgcrop.o: ../../../winix/winixd/core/ugcontainer.h imgcrop.o: ../../../winix/winixd/core/request.h imgcrop.o: ../../../winix/winixd/core/error.h @@ -1687,16 +1726,8 @@ imgcrop.o: ../../../winix/winixd/core/winixmodel.h imgcrop.o: ../../../winix/winixd/core/plugin.h imgcrop.o: ../../../winix/winixd/core/pluginmsg.h imgcrop.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -imgcrop.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -imgcrop.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -imgcrop.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -imgcrop.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -imgcrop.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -imgcrop.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -imgcrop.o: ../../../morm/src/finderhelper.h -imgcrop.o: ../../../morm/src/fieldvaluehelper.h -imgcrop.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -imgcrop.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +imgcrop.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +imgcrop.o: ../../../morm/src/jsonexpression.h imgcrop.o: ../../../morm/src/postgresqlexpression.h imgcrop.o: ../../../morm/src/jsonconnector.h imgcrop.o: ../../../morm/src/postgresqlconnector.h @@ -1726,8 +1757,9 @@ imgcrop.o: ../../../pikotools/convert/patternreplacer.h imgcrop.o: ../../../winix/winixd/templates/patterns.h locale.h imgcrop.o: ../../../winix/winixd/templates/localefilter.h imgcrop.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -imgcrop.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -imgcrop.o: functionparser.h ../../../winix/winixd/core/cur.h +imgcrop.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +imgcrop.o: ../../../ezc/src/cache.h functions.h functionparser.h +imgcrop.o: ../../../winix/winixd/core/cur.h imgcrop.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h imgcrop.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h imgcrop.o: emacs.h env.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -1751,16 +1783,16 @@ imgcrop.o: ../../../winix/winixd/core/basethread.h imgcrop.o: ../../../winix/winixd/notify/templatesnotify.h imgcrop.o: ../../../winix/winixd/core/users.h imgcrop.o: ../../../winix/winixd/core/timezones.h -ipban.o: ipban.h functionbase.h ../../../winix/winixd/core/item.h -ipban.o: ../../../pikotools/space/space.h -ipban.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -ipban.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +ipban.o: ipban.h functionbase.h ../../../winix/winixd/db/db.h ipban.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h ipban.o: ../../../winix/winixd/db/dbtextstream.h ipban.o: ../../../winix/winixd/core/textstream.h -ipban.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +ipban.o: ../../../winix/winixd/core/misc.h ipban.o: ../../../winix/winixd/core/requesttypes.h ipban.o: ../../../pikotools/textstream/textstream.h +ipban.o: ../../../pikotools/space/space.h +ipban.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +ipban.o: ../../../pikotools/convert/inttostr.h ipban.o: ../../../pikotools/membuffer/membuffer.h ipban.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h ipban.o: ../../../winix/winixd/core/winix_const.h @@ -1786,6 +1818,16 @@ ipban.o: ../../../winix/winixd/db/dbitemcolumns.h ipban.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h ipban.o: ../../../winix/winixd/core/dircontainer.h ipban.o: ../../../winix/winixd/core/winixbase.h +ipban.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +ipban.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +ipban.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +ipban.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +ipban.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +ipban.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +ipban.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +ipban.o: ../../../morm/src/fieldvaluehelper.h +ipban.o: ../../../morm/src/flatexpression.h +ipban.o: ../../../winix/winixd/models/itemcontent.h ipban.o: ../../../winix/winixd/core/ugcontainer.h ipban.o: ../../../winix/winixd/core/request.h ipban.o: ../../../winix/winixd/core/error.h @@ -1799,16 +1841,8 @@ ipban.o: ../../../winix/winixd/core/winixmodel.h ipban.o: ../../../winix/winixd/core/plugin.h ipban.o: ../../../winix/winixd/core/pluginmsg.h ipban.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -ipban.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -ipban.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -ipban.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -ipban.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -ipban.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -ipban.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -ipban.o: ../../../morm/src/finderhelper.h -ipban.o: ../../../morm/src/fieldvaluehelper.h -ipban.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -ipban.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +ipban.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +ipban.o: ../../../morm/src/jsonexpression.h ipban.o: ../../../morm/src/postgresqlexpression.h ipban.o: ../../../morm/src/jsonconnector.h ipban.o: ../../../morm/src/postgresqlconnector.h @@ -1837,8 +1871,9 @@ ipban.o: ../../../pikotools/convert/patternreplacer.h ipban.o: ../../../winix/winixd/templates/patterns.h locale.h ipban.o: ../../../winix/winixd/templates/localefilter.h ipban.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -ipban.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -ipban.o: functionparser.h ../../../winix/winixd/core/cur.h +ipban.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +ipban.o: ../../../ezc/src/cache.h functions.h functionparser.h +ipban.o: ../../../winix/winixd/core/cur.h ipban.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h ipban.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h ipban.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -1862,16 +1897,16 @@ ipban.o: ../../../winix/winixd/core/basethread.h ipban.o: ../../../winix/winixd/notify/templatesnotify.h ipban.o: ../../../winix/winixd/core/users.h ipban.o: ../../../winix/winixd/core/timezones.h -last.o: last.h functionbase.h ../../../winix/winixd/core/item.h -last.o: ../../../pikotools/space/space.h -last.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -last.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +last.o: last.h functionbase.h ../../../winix/winixd/db/db.h last.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h last.o: ../../../winix/winixd/db/dbtextstream.h last.o: ../../../winix/winixd/core/textstream.h -last.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +last.o: ../../../winix/winixd/core/misc.h last.o: ../../../winix/winixd/core/requesttypes.h last.o: ../../../pikotools/textstream/textstream.h +last.o: ../../../pikotools/space/space.h +last.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +last.o: ../../../pikotools/convert/inttostr.h last.o: ../../../pikotools/membuffer/membuffer.h last.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h last.o: ../../../winix/winixd/core/winix_const.h @@ -1896,6 +1931,16 @@ last.o: ../../../winix/winixd/db/dbitemcolumns.h last.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h last.o: ../../../winix/winixd/core/dircontainer.h last.o: ../../../winix/winixd/core/winixbase.h +last.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +last.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +last.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +last.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +last.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +last.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +last.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +last.o: ../../../morm/src/fieldvaluehelper.h +last.o: ../../../morm/src/flatexpression.h +last.o: ../../../winix/winixd/models/itemcontent.h last.o: ../../../winix/winixd/core/ugcontainer.h last.o: ../../../winix/winixd/core/request.h last.o: ../../../winix/winixd/core/error.h @@ -1909,15 +1954,8 @@ last.o: ../../../winix/winixd/core/winixmodel.h last.o: ../../../winix/winixd/core/plugin.h last.o: ../../../winix/winixd/core/pluginmsg.h last.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -last.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -last.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -last.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -last.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -last.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -last.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -last.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -last.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -last.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +last.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +last.o: ../../../morm/src/jsonexpression.h last.o: ../../../morm/src/postgresqlexpression.h last.o: ../../../morm/src/jsonconnector.h last.o: ../../../morm/src/postgresqlconnector.h @@ -1945,8 +1983,8 @@ last.o: ../../../pikotools/convert/patternreplacer.h last.o: ../../../winix/winixd/templates/patterns.h locale.h last.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h last.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -last.o: ../../../ezc/src/cache.h functions.h functionparser.h -last.o: ../../../winix/winixd/core/cur.h +last.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +last.o: functionparser.h ../../../winix/winixd/core/cur.h last.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h last.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h last.o: emacs.h env.h imgcrop.h login.h logout.h ln.h ls.h man.h meta.h @@ -1970,16 +2008,15 @@ last.o: ../../../winix/winixd/core/basethread.h last.o: ../../../winix/winixd/notify/templatesnotify.h last.o: ../../../winix/winixd/core/users.h last.o: ../../../winix/winixd/core/timezones.h -ln.o: ln.h functionbase.h ../../../winix/winixd/core/item.h -ln.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -ln.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -ln.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -ln.o: ../../../winix/winixd/db/dbconn.h +ln.o: ln.h functionbase.h ../../../winix/winixd/db/db.h +ln.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h ln.o: ../../../winix/winixd/db/dbtextstream.h ln.o: ../../../winix/winixd/core/textstream.h -ln.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +ln.o: ../../../winix/winixd/core/misc.h ln.o: ../../../winix/winixd/core/requesttypes.h ln.o: ../../../pikotools/textstream/textstream.h +ln.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +ln.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h ln.o: ../../../pikotools/membuffer/membuffer.h ln.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h ln.o: ../../../winix/winixd/core/winix_const.h @@ -2001,6 +2038,15 @@ ln.o: ../../../winix/winixd/db/dbitemcolumns.h ln.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h ln.o: ../../../winix/winixd/core/dircontainer.h ln.o: ../../../winix/winixd/core/winixbase.h +ln.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +ln.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +ln.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +ln.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +ln.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +ln.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +ln.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +ln.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/flatexpression.h +ln.o: ../../../winix/winixd/models/itemcontent.h ln.o: ../../../winix/winixd/core/ugcontainer.h ln.o: ../../../winix/winixd/core/request.h ../../../winix/winixd/core/error.h ln.o: ../../../winix/winixd/core/config.h @@ -2013,15 +2059,8 @@ ln.o: ../../../winix/winixd/core/winixmodel.h ln.o: ../../../winix/winixd/core/plugin.h ln.o: ../../../winix/winixd/core/pluginmsg.h ln.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -ln.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -ln.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -ln.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -ln.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -ln.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -ln.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -ln.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -ln.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -ln.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +ln.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +ln.o: ../../../morm/src/jsonexpression.h ln.o: ../../../morm/src/postgresqlexpression.h ln.o: ../../../morm/src/jsonconnector.h ln.o: ../../../morm/src/postgresqlconnector.h @@ -2047,8 +2086,8 @@ ln.o: ../../../pikotools/convert/patternreplacer.h ln.o: ../../../winix/winixd/templates/patterns.h locale.h ln.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h ln.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -ln.o: ../../../ezc/src/cache.h functions.h functionparser.h -ln.o: ../../../winix/winixd/core/cur.h +ln.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +ln.o: functionparser.h ../../../winix/winixd/core/cur.h ln.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h ln.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h ln.o: emacs.h env.h imgcrop.h last.h login.h logout.h ls.h man.h meta.h @@ -2074,17 +2113,17 @@ ln.o: ../../../winix/winixd/core/users.h ln.o: ../../../winix/winixd/core/timezones.h ln.o: ../../../winix/winixd/core/misc.h ln.o: ../../../winix/winixd/functions/functions.h -locale.o: locale.h functionbase.h ../../../winix/winixd/core/item.h -locale.o: ../../../pikotools/space/space.h -locale.o: ../../../pikotools/textstream/types.h -locale.o: ../../../pikotools/date/date.h -locale.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +locale.o: locale.h functionbase.h ../../../winix/winixd/db/db.h locale.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h locale.o: ../../../winix/winixd/db/dbtextstream.h locale.o: ../../../winix/winixd/core/textstream.h -locale.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +locale.o: ../../../winix/winixd/core/misc.h locale.o: ../../../winix/winixd/core/requesttypes.h locale.o: ../../../pikotools/textstream/textstream.h +locale.o: ../../../pikotools/space/space.h +locale.o: ../../../pikotools/textstream/types.h +locale.o: ../../../pikotools/date/date.h +locale.o: ../../../pikotools/convert/inttostr.h locale.o: ../../../pikotools/membuffer/membuffer.h locale.o: ../../../pikotools/textstream/types.h locale.o: ../../../pikotools/utf8/utf8.h @@ -2112,6 +2151,16 @@ locale.o: ../../../winix/winixd/core/user.h locale.o: ../../../winix/winixd/core/group.h locale.o: ../../../winix/winixd/core/dircontainer.h locale.o: ../../../winix/winixd/core/winixbase.h +locale.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +locale.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +locale.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +locale.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +locale.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +locale.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +locale.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +locale.o: ../../../morm/src/fieldvaluehelper.h +locale.o: ../../../morm/src/flatexpression.h +locale.o: ../../../winix/winixd/models/itemcontent.h locale.o: ../../../winix/winixd/core/ugcontainer.h locale.o: ../../../winix/winixd/core/request.h locale.o: ../../../winix/winixd/core/error.h @@ -2126,16 +2175,8 @@ locale.o: ../../../winix/winixd/core/winixmodel.h locale.o: ../../../winix/winixd/core/plugin.h locale.o: ../../../winix/winixd/core/pluginmsg.h locale.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -locale.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -locale.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -locale.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -locale.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -locale.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -locale.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -locale.o: ../../../morm/src/finderhelper.h -locale.o: ../../../morm/src/fieldvaluehelper.h -locale.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -locale.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +locale.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +locale.o: ../../../morm/src/jsonexpression.h locale.o: ../../../morm/src/postgresqlexpression.h locale.o: ../../../morm/src/jsonconnector.h locale.o: ../../../morm/src/postgresqlconnector.h @@ -2165,8 +2206,9 @@ locale.o: ../../../pikotools/convert/patternreplacer.h locale.o: ../../../winix/winixd/templates/patterns.h locale.o: ../../../winix/winixd/templates/localefilter.h locale.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -locale.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -locale.o: functionparser.h ../../../winix/winixd/core/cur.h +locale.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +locale.o: ../../../ezc/src/cache.h functions.h functionparser.h +locale.o: ../../../winix/winixd/core/cur.h locale.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h locale.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h locale.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -2199,22 +2241,21 @@ locale.o: ../../../winix/winixd/templates/htmltextstream.h login.o: ../../../winix/winixd/core/sessionmanager.h login.o: ../../../winix/winixd/core/sessioncontainer.h login.o: ../../../winix/winixd/core/session.h -login.o: ../../../winix/winixd/core/item.h ../../../winix/winixd/core/error.h -login.o: ../../../winix/winixd/core/user.h +login.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/user.h login.o: ../../../winix/winixd/core/plugindata.h login.o: ../../../winix/winixd/core/rebus.h login.o: ../../../winix/winixd/core/winixbase.h login.o: ../../../winix/winixd/core/textstream.h login.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -login.o: ipban.h functionbase.h ../../../winix/winixd/core/item.h -login.o: ../../../pikotools/space/space.h -login.o: ../../../pikotools/textstream/types.h ../../../winix/winixd/db/db.h +login.o: ipban.h functionbase.h ../../../winix/winixd/db/db.h login.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h login.o: ../../../winix/winixd/db/dbtextstream.h login.o: ../../../winix/winixd/core/textstream.h login.o: ../../../winix/winixd/core/misc.h login.o: ../../../winix/winixd/core/requesttypes.h login.o: ../../../pikotools/textstream/textstream.h +login.o: ../../../pikotools/space/space.h +login.o: ../../../pikotools/textstream/types.h login.o: ../../../pikotools/membuffer/membuffer.h login.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h login.o: ../../../winix/winixd/core/winix_const.h @@ -2239,6 +2280,16 @@ login.o: ../../../winix/winixd/db/dbitemquery.h login.o: ../../../winix/winixd/db/dbitemcolumns.h login.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h login.o: ../../../winix/winixd/core/dircontainer.h +login.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +login.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +login.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +login.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +login.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +login.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +login.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +login.o: ../../../morm/src/fieldvaluehelper.h +login.o: ../../../morm/src/flatexpression.h +login.o: ../../../winix/winixd/models/itemcontent.h login.o: ../../../winix/winixd/core/ugcontainer.h login.o: ../../../winix/winixd/core/request.h login.o: ../../../winix/winixd/core/config.h @@ -2249,16 +2300,8 @@ login.o: ../../../winix/winixd/core/basethread.h login.o: ../../../winix/winixd/core/winixmodel.h login.o: ../../../winix/winixd/core/plugin.h login.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -login.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -login.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -login.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -login.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -login.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -login.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -login.o: ../../../morm/src/finderhelper.h -login.o: ../../../morm/src/fieldvaluehelper.h -login.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -login.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +login.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +login.o: ../../../morm/src/jsonexpression.h login.o: ../../../morm/src/postgresqlexpression.h login.o: ../../../morm/src/jsonconnector.h login.o: ../../../morm/src/postgresqlconnector.h @@ -2284,8 +2327,9 @@ login.o: ../../../pikotools/convert/patternreplacer.h login.o: ../../../winix/winixd/templates/patterns.h locale.h login.o: ../../../winix/winixd/templates/localefilter.h login.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -login.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -login.o: functionparser.h ../../../winix/winixd/core/cur.h +login.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +login.o: ../../../ezc/src/cache.h functions.h functionparser.h +login.o: ../../../winix/winixd/core/cur.h login.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h login.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h login.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -2307,17 +2351,17 @@ login.o: ../../../winix/winixd/core/ipbancontainer.h login.o: ../../../winix/winixd/core/system.h login.o: ../../../winix/winixd/core/sessionidmanager.h login.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -logout.o: logout.h functionbase.h ../../../winix/winixd/core/item.h -logout.o: ../../../pikotools/space/space.h -logout.o: ../../../pikotools/textstream/types.h -logout.o: ../../../pikotools/date/date.h -logout.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +logout.o: logout.h functionbase.h ../../../winix/winixd/db/db.h logout.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h logout.o: ../../../winix/winixd/db/dbtextstream.h logout.o: ../../../winix/winixd/core/textstream.h -logout.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +logout.o: ../../../winix/winixd/core/misc.h logout.o: ../../../winix/winixd/core/requesttypes.h logout.o: ../../../pikotools/textstream/textstream.h +logout.o: ../../../pikotools/space/space.h +logout.o: ../../../pikotools/textstream/types.h +logout.o: ../../../pikotools/date/date.h +logout.o: ../../../pikotools/convert/inttostr.h logout.o: ../../../pikotools/membuffer/membuffer.h logout.o: ../../../pikotools/textstream/types.h logout.o: ../../../pikotools/utf8/utf8.h @@ -2345,6 +2389,16 @@ logout.o: ../../../winix/winixd/core/user.h logout.o: ../../../winix/winixd/core/group.h logout.o: ../../../winix/winixd/core/dircontainer.h logout.o: ../../../winix/winixd/core/winixbase.h +logout.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +logout.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +logout.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +logout.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +logout.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +logout.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +logout.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +logout.o: ../../../morm/src/fieldvaluehelper.h +logout.o: ../../../morm/src/flatexpression.h +logout.o: ../../../winix/winixd/models/itemcontent.h logout.o: ../../../winix/winixd/core/ugcontainer.h logout.o: ../../../winix/winixd/core/request.h logout.o: ../../../winix/winixd/core/error.h @@ -2359,16 +2413,8 @@ logout.o: ../../../winix/winixd/core/winixmodel.h logout.o: ../../../winix/winixd/core/plugin.h logout.o: ../../../winix/winixd/core/pluginmsg.h logout.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -logout.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -logout.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -logout.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -logout.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -logout.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -logout.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -logout.o: ../../../morm/src/finderhelper.h -logout.o: ../../../morm/src/fieldvaluehelper.h -logout.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -logout.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +logout.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +logout.o: ../../../morm/src/jsonexpression.h logout.o: ../../../morm/src/postgresqlexpression.h logout.o: ../../../morm/src/jsonconnector.h logout.o: ../../../morm/src/postgresqlconnector.h @@ -2398,8 +2444,9 @@ logout.o: ../../../pikotools/convert/patternreplacer.h logout.o: ../../../winix/winixd/templates/patterns.h locale.h logout.o: ../../../winix/winixd/templates/localefilter.h logout.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -logout.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -logout.o: functionparser.h ../../../winix/winixd/core/cur.h +logout.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +logout.o: ../../../ezc/src/cache.h functions.h functionparser.h +logout.o: ../../../winix/winixd/core/cur.h logout.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h logout.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h logout.o: emacs.h env.h imgcrop.h last.h login.h ln.h ls.h man.h meta.h @@ -2423,16 +2470,15 @@ logout.o: ../../../winix/winixd/core/basethread.h logout.o: ../../../winix/winixd/notify/templatesnotify.h logout.o: ../../../winix/winixd/core/users.h logout.o: ../../../winix/winixd/core/timezones.h -ls.o: ls.h functionbase.h ../../../winix/winixd/core/item.h -ls.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -ls.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -ls.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -ls.o: ../../../winix/winixd/db/dbconn.h +ls.o: ls.h functionbase.h ../../../winix/winixd/db/db.h +ls.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h ls.o: ../../../winix/winixd/db/dbtextstream.h ls.o: ../../../winix/winixd/core/textstream.h -ls.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +ls.o: ../../../winix/winixd/core/misc.h ls.o: ../../../winix/winixd/core/requesttypes.h ls.o: ../../../pikotools/textstream/textstream.h +ls.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +ls.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h ls.o: ../../../pikotools/membuffer/membuffer.h ls.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h ls.o: ../../../winix/winixd/core/winix_const.h @@ -2454,6 +2500,15 @@ ls.o: ../../../winix/winixd/db/dbitemcolumns.h ls.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h ls.o: ../../../winix/winixd/core/dircontainer.h ls.o: ../../../winix/winixd/core/winixbase.h +ls.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +ls.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +ls.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +ls.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +ls.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +ls.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +ls.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +ls.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/flatexpression.h +ls.o: ../../../winix/winixd/models/itemcontent.h ls.o: ../../../winix/winixd/core/ugcontainer.h ls.o: ../../../winix/winixd/core/request.h ../../../winix/winixd/core/error.h ls.o: ../../../winix/winixd/core/config.h @@ -2466,15 +2521,8 @@ ls.o: ../../../winix/winixd/core/winixmodel.h ls.o: ../../../winix/winixd/core/plugin.h ls.o: ../../../winix/winixd/core/pluginmsg.h ls.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -ls.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -ls.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -ls.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -ls.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -ls.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -ls.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -ls.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -ls.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -ls.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +ls.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +ls.o: ../../../morm/src/jsonexpression.h ls.o: ../../../morm/src/postgresqlexpression.h ls.o: ../../../morm/src/jsonconnector.h ls.o: ../../../morm/src/postgresqlconnector.h @@ -2500,8 +2548,8 @@ ls.o: ../../../pikotools/convert/patternreplacer.h ls.o: ../../../winix/winixd/templates/patterns.h locale.h ls.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h ls.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -ls.o: ../../../ezc/src/cache.h functions.h functionparser.h -ls.o: ../../../winix/winixd/core/cur.h +ls.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +ls.o: functionparser.h ../../../winix/winixd/core/cur.h ls.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h ls.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h ls.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h man.h meta.h @@ -2525,16 +2573,15 @@ ls.o: ../../../winix/winixd/core/basethread.h ls.o: ../../../winix/winixd/notify/templatesnotify.h ls.o: ../../../winix/winixd/core/users.h ls.o: ../../../winix/winixd/core/timezones.h -man.o: man.h functionbase.h ../../../winix/winixd/core/item.h -man.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -man.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -man.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -man.o: ../../../winix/winixd/db/dbconn.h +man.o: man.h functionbase.h ../../../winix/winixd/db/db.h +man.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h man.o: ../../../winix/winixd/db/dbtextstream.h man.o: ../../../winix/winixd/core/textstream.h -man.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +man.o: ../../../winix/winixd/core/misc.h man.o: ../../../winix/winixd/core/requesttypes.h man.o: ../../../pikotools/textstream/textstream.h +man.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +man.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h man.o: ../../../pikotools/membuffer/membuffer.h man.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h man.o: ../../../winix/winixd/core/winix_const.h @@ -2558,6 +2605,16 @@ man.o: ../../../winix/winixd/db/dbitemcolumns.h man.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h man.o: ../../../winix/winixd/core/dircontainer.h man.o: ../../../winix/winixd/core/winixbase.h +man.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +man.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +man.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +man.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +man.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +man.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +man.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +man.o: ../../../morm/src/fieldvaluehelper.h +man.o: ../../../morm/src/flatexpression.h +man.o: ../../../winix/winixd/models/itemcontent.h man.o: ../../../winix/winixd/core/ugcontainer.h man.o: ../../../winix/winixd/core/request.h man.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h @@ -2570,15 +2627,8 @@ man.o: ../../../winix/winixd/core/winixmodel.h man.o: ../../../winix/winixd/core/plugin.h man.o: ../../../winix/winixd/core/pluginmsg.h man.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -man.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -man.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -man.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -man.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -man.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -man.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -man.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -man.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -man.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +man.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +man.o: ../../../morm/src/jsonexpression.h man.o: ../../../morm/src/postgresqlexpression.h man.o: ../../../morm/src/jsonconnector.h man.o: ../../../morm/src/postgresqlconnector.h @@ -2605,8 +2655,8 @@ man.o: ../../../pikotools/convert/patternreplacer.h man.o: ../../../winix/winixd/templates/patterns.h locale.h man.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h man.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -man.o: ../../../ezc/src/cache.h functions.h functionparser.h -man.o: ../../../winix/winixd/core/cur.h +man.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +man.o: functionparser.h ../../../winix/winixd/core/cur.h man.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h man.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h man.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h meta.h @@ -2630,16 +2680,16 @@ man.o: ../../../winix/winixd/core/basethread.h man.o: ../../../winix/winixd/notify/templatesnotify.h man.o: ../../../winix/winixd/core/users.h man.o: ../../../winix/winixd/core/timezones.h -meta.o: meta.h functionbase.h ../../../winix/winixd/core/item.h -meta.o: ../../../pikotools/space/space.h -meta.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -meta.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +meta.o: meta.h functionbase.h ../../../winix/winixd/db/db.h meta.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h meta.o: ../../../winix/winixd/db/dbtextstream.h meta.o: ../../../winix/winixd/core/textstream.h -meta.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +meta.o: ../../../winix/winixd/core/misc.h meta.o: ../../../winix/winixd/core/requesttypes.h meta.o: ../../../pikotools/textstream/textstream.h +meta.o: ../../../pikotools/space/space.h +meta.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +meta.o: ../../../pikotools/convert/inttostr.h meta.o: ../../../pikotools/membuffer/membuffer.h meta.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h meta.o: ../../../winix/winixd/core/winix_const.h @@ -2664,6 +2714,16 @@ meta.o: ../../../winix/winixd/db/dbitemcolumns.h meta.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h meta.o: ../../../winix/winixd/core/dircontainer.h meta.o: ../../../winix/winixd/core/winixbase.h +meta.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +meta.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +meta.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +meta.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +meta.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +meta.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +meta.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +meta.o: ../../../morm/src/fieldvaluehelper.h +meta.o: ../../../morm/src/flatexpression.h +meta.o: ../../../winix/winixd/models/itemcontent.h meta.o: ../../../winix/winixd/core/ugcontainer.h meta.o: ../../../winix/winixd/core/request.h meta.o: ../../../winix/winixd/core/error.h @@ -2677,15 +2737,8 @@ meta.o: ../../../winix/winixd/core/winixmodel.h meta.o: ../../../winix/winixd/core/plugin.h meta.o: ../../../winix/winixd/core/pluginmsg.h meta.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -meta.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -meta.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -meta.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -meta.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -meta.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -meta.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -meta.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -meta.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -meta.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +meta.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +meta.o: ../../../morm/src/jsonexpression.h meta.o: ../../../morm/src/postgresqlexpression.h meta.o: ../../../morm/src/jsonconnector.h meta.o: ../../../morm/src/postgresqlconnector.h @@ -2713,8 +2766,8 @@ meta.o: ../../../pikotools/convert/patternreplacer.h meta.o: ../../../winix/winixd/templates/patterns.h locale.h meta.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h meta.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -meta.o: ../../../ezc/src/cache.h functions.h functionparser.h -meta.o: ../../../winix/winixd/core/cur.h +meta.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +meta.o: functionparser.h ../../../winix/winixd/core/cur.h meta.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h meta.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h meta.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -2738,16 +2791,16 @@ meta.o: ../../../winix/winixd/core/basethread.h meta.o: ../../../winix/winixd/notify/templatesnotify.h meta.o: ../../../winix/winixd/core/users.h meta.o: ../../../winix/winixd/core/timezones.h -mkdir.o: mkdir.h functionbase.h ../../../winix/winixd/core/item.h -mkdir.o: ../../../pikotools/space/space.h -mkdir.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -mkdir.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +mkdir.o: mkdir.h functionbase.h ../../../winix/winixd/db/db.h mkdir.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h mkdir.o: ../../../winix/winixd/db/dbtextstream.h mkdir.o: ../../../winix/winixd/core/textstream.h -mkdir.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +mkdir.o: ../../../winix/winixd/core/misc.h mkdir.o: ../../../winix/winixd/core/requesttypes.h mkdir.o: ../../../pikotools/textstream/textstream.h +mkdir.o: ../../../pikotools/space/space.h +mkdir.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +mkdir.o: ../../../pikotools/convert/inttostr.h mkdir.o: ../../../pikotools/membuffer/membuffer.h mkdir.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h mkdir.o: ../../../winix/winixd/core/winix_const.h @@ -2773,6 +2826,16 @@ mkdir.o: ../../../winix/winixd/db/dbitemcolumns.h mkdir.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h mkdir.o: ../../../winix/winixd/core/dircontainer.h mkdir.o: ../../../winix/winixd/core/winixbase.h +mkdir.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +mkdir.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +mkdir.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +mkdir.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +mkdir.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +mkdir.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +mkdir.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +mkdir.o: ../../../morm/src/fieldvaluehelper.h +mkdir.o: ../../../morm/src/flatexpression.h +mkdir.o: ../../../winix/winixd/models/itemcontent.h mkdir.o: ../../../winix/winixd/core/ugcontainer.h mkdir.o: ../../../winix/winixd/core/request.h mkdir.o: ../../../winix/winixd/core/error.h @@ -2786,16 +2849,8 @@ mkdir.o: ../../../winix/winixd/core/winixmodel.h mkdir.o: ../../../winix/winixd/core/plugin.h mkdir.o: ../../../winix/winixd/core/pluginmsg.h mkdir.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -mkdir.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -mkdir.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -mkdir.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -mkdir.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -mkdir.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -mkdir.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -mkdir.o: ../../../morm/src/finderhelper.h -mkdir.o: ../../../morm/src/fieldvaluehelper.h -mkdir.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -mkdir.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +mkdir.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +mkdir.o: ../../../morm/src/jsonexpression.h mkdir.o: ../../../morm/src/postgresqlexpression.h mkdir.o: ../../../morm/src/jsonconnector.h mkdir.o: ../../../morm/src/postgresqlconnector.h @@ -2824,8 +2879,9 @@ mkdir.o: ../../../pikotools/convert/patternreplacer.h mkdir.o: ../../../winix/winixd/templates/patterns.h locale.h mkdir.o: ../../../winix/winixd/templates/localefilter.h mkdir.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -mkdir.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -mkdir.o: functionparser.h ../../../winix/winixd/core/cur.h +mkdir.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +mkdir.o: ../../../ezc/src/cache.h functions.h functionparser.h +mkdir.o: ../../../winix/winixd/core/cur.h mkdir.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h mkdir.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h mkdir.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -2849,16 +2905,16 @@ mkdir.o: ../../../winix/winixd/core/basethread.h mkdir.o: ../../../winix/winixd/notify/templatesnotify.h mkdir.o: ../../../winix/winixd/core/users.h mkdir.o: ../../../winix/winixd/core/timezones.h -mount.o: mount.h functionbase.h ../../../winix/winixd/core/item.h -mount.o: ../../../pikotools/space/space.h -mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -mount.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +mount.o: mount.h functionbase.h ../../../winix/winixd/db/db.h mount.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h mount.o: ../../../winix/winixd/db/dbtextstream.h mount.o: ../../../winix/winixd/core/textstream.h -mount.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +mount.o: ../../../winix/winixd/core/misc.h mount.o: ../../../winix/winixd/core/requesttypes.h mount.o: ../../../pikotools/textstream/textstream.h +mount.o: ../../../pikotools/space/space.h +mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +mount.o: ../../../pikotools/convert/inttostr.h mount.o: ../../../pikotools/membuffer/membuffer.h mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h mount.o: ../../../winix/winixd/core/winix_const.h @@ -2884,6 +2940,16 @@ mount.o: ../../../winix/winixd/db/dbitemcolumns.h mount.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h mount.o: ../../../winix/winixd/core/dircontainer.h mount.o: ../../../winix/winixd/core/winixbase.h +mount.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +mount.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +mount.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +mount.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +mount.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +mount.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +mount.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +mount.o: ../../../morm/src/fieldvaluehelper.h +mount.o: ../../../morm/src/flatexpression.h +mount.o: ../../../winix/winixd/models/itemcontent.h mount.o: ../../../winix/winixd/core/ugcontainer.h mount.o: ../../../winix/winixd/core/request.h mount.o: ../../../winix/winixd/core/error.h @@ -2897,16 +2963,8 @@ mount.o: ../../../winix/winixd/core/winixmodel.h mount.o: ../../../winix/winixd/core/plugin.h mount.o: ../../../winix/winixd/core/pluginmsg.h mount.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -mount.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -mount.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -mount.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -mount.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -mount.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -mount.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -mount.o: ../../../morm/src/finderhelper.h -mount.o: ../../../morm/src/fieldvaluehelper.h -mount.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -mount.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +mount.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +mount.o: ../../../morm/src/jsonexpression.h mount.o: ../../../morm/src/postgresqlexpression.h mount.o: ../../../morm/src/jsonconnector.h mount.o: ../../../morm/src/postgresqlconnector.h @@ -2935,8 +2993,9 @@ mount.o: ../../../pikotools/convert/patternreplacer.h mount.o: ../../../winix/winixd/templates/patterns.h locale.h mount.o: ../../../winix/winixd/templates/localefilter.h mount.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -mount.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -mount.o: functionparser.h ../../../winix/winixd/core/cur.h +mount.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +mount.o: ../../../ezc/src/cache.h functions.h functionparser.h +mount.o: ../../../winix/winixd/core/cur.h mount.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h mount.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h mount.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -2960,16 +3019,15 @@ mount.o: ../../../winix/winixd/core/basethread.h mount.o: ../../../winix/winixd/notify/templatesnotify.h mount.o: ../../../winix/winixd/core/users.h mount.o: ../../../winix/winixd/core/timezones.h -mv.o: mv.h functionbase.h ../../../winix/winixd/core/item.h -mv.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -mv.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -mv.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -mv.o: ../../../winix/winixd/db/dbconn.h +mv.o: mv.h functionbase.h ../../../winix/winixd/db/db.h +mv.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h mv.o: ../../../winix/winixd/db/dbtextstream.h mv.o: ../../../winix/winixd/core/textstream.h -mv.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +mv.o: ../../../winix/winixd/core/misc.h mv.o: ../../../winix/winixd/core/requesttypes.h mv.o: ../../../pikotools/textstream/textstream.h +mv.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +mv.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h mv.o: ../../../pikotools/membuffer/membuffer.h mv.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h mv.o: ../../../winix/winixd/core/winix_const.h @@ -2991,6 +3049,15 @@ mv.o: ../../../winix/winixd/db/dbitemcolumns.h mv.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h mv.o: ../../../winix/winixd/core/dircontainer.h mv.o: ../../../winix/winixd/core/winixbase.h +mv.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +mv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +mv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +mv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +mv.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +mv.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +mv.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +mv.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/flatexpression.h +mv.o: ../../../winix/winixd/models/itemcontent.h mv.o: ../../../winix/winixd/core/ugcontainer.h mv.o: ../../../winix/winixd/core/request.h ../../../winix/winixd/core/error.h mv.o: ../../../winix/winixd/core/config.h @@ -3003,15 +3070,8 @@ mv.o: ../../../winix/winixd/core/winixmodel.h mv.o: ../../../winix/winixd/core/plugin.h mv.o: ../../../winix/winixd/core/pluginmsg.h mv.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -mv.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -mv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -mv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -mv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -mv.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -mv.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -mv.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -mv.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -mv.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +mv.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +mv.o: ../../../morm/src/jsonexpression.h mv.o: ../../../morm/src/postgresqlexpression.h mv.o: ../../../morm/src/jsonconnector.h mv.o: ../../../morm/src/postgresqlconnector.h @@ -3037,8 +3097,8 @@ mv.o: ../../../pikotools/convert/patternreplacer.h mv.o: ../../../winix/winixd/templates/patterns.h locale.h mv.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h mv.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -mv.o: ../../../ezc/src/cache.h functions.h functionparser.h -mv.o: ../../../winix/winixd/core/cur.h +mv.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +mv.o: functionparser.h ../../../winix/winixd/core/cur.h mv.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h mv.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h mv.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -3062,19 +3122,18 @@ mv.o: ../../../winix/winixd/core/basethread.h mv.o: ../../../winix/winixd/notify/templatesnotify.h mv.o: ../../../winix/winixd/core/users.h mv.o: ../../../winix/winixd/core/timezones.h -nicedit.o: nicedit.h functionbase.h ../../../winix/winixd/core/item.h -nicedit.o: ../../../pikotools/space/space.h -nicedit.o: ../../../pikotools/textstream/types.h -nicedit.o: ../../../pikotools/date/date.h -nicedit.o: ../../../pikotools/convert/inttostr.h -nicedit.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +nicedit.o: nicedit.h functionbase.h ../../../winix/winixd/db/db.h +nicedit.o: ../../../winix/winixd/db/dbbase.h nicedit.o: ../../../winix/winixd/db/dbconn.h nicedit.o: ../../../winix/winixd/db/dbtextstream.h nicedit.o: ../../../winix/winixd/core/textstream.h nicedit.o: ../../../winix/winixd/core/misc.h -nicedit.o: ../../../winix/winixd/core/item.h nicedit.o: ../../../winix/winixd/core/requesttypes.h nicedit.o: ../../../pikotools/textstream/textstream.h +nicedit.o: ../../../pikotools/space/space.h +nicedit.o: ../../../pikotools/textstream/types.h +nicedit.o: ../../../pikotools/date/date.h +nicedit.o: ../../../pikotools/convert/inttostr.h nicedit.o: ../../../pikotools/membuffer/membuffer.h nicedit.o: ../../../pikotools/textstream/types.h nicedit.o: ../../../pikotools/utf8/utf8.h @@ -3102,6 +3161,16 @@ nicedit.o: ../../../winix/winixd/core/user.h nicedit.o: ../../../winix/winixd/core/group.h nicedit.o: ../../../winix/winixd/core/dircontainer.h nicedit.o: ../../../winix/winixd/core/winixbase.h +nicedit.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +nicedit.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +nicedit.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +nicedit.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +nicedit.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +nicedit.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +nicedit.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +nicedit.o: ../../../morm/src/fieldvaluehelper.h +nicedit.o: ../../../morm/src/flatexpression.h +nicedit.o: ../../../winix/winixd/models/itemcontent.h nicedit.o: ../../../winix/winixd/core/ugcontainer.h nicedit.o: ../../../winix/winixd/core/request.h nicedit.o: ../../../winix/winixd/core/error.h @@ -3116,16 +3185,8 @@ nicedit.o: ../../../winix/winixd/core/winixmodel.h nicedit.o: ../../../winix/winixd/core/plugin.h nicedit.o: ../../../winix/winixd/core/pluginmsg.h nicedit.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -nicedit.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -nicedit.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -nicedit.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -nicedit.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -nicedit.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -nicedit.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -nicedit.o: ../../../morm/src/finderhelper.h -nicedit.o: ../../../morm/src/fieldvaluehelper.h -nicedit.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -nicedit.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +nicedit.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +nicedit.o: ../../../morm/src/jsonexpression.h nicedit.o: ../../../morm/src/postgresqlexpression.h nicedit.o: ../../../morm/src/jsonconnector.h nicedit.o: ../../../morm/src/postgresqlconnector.h @@ -3155,8 +3216,9 @@ nicedit.o: ../../../pikotools/convert/patternreplacer.h nicedit.o: ../../../winix/winixd/templates/patterns.h locale.h nicedit.o: ../../../winix/winixd/templates/localefilter.h nicedit.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -nicedit.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -nicedit.o: functionparser.h ../../../winix/winixd/core/cur.h +nicedit.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +nicedit.o: ../../../ezc/src/cache.h functions.h functionparser.h +nicedit.o: ../../../winix/winixd/core/cur.h nicedit.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h nicedit.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h nicedit.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -3180,16 +3242,16 @@ nicedit.o: ../../../winix/winixd/core/basethread.h nicedit.o: ../../../winix/winixd/notify/templatesnotify.h nicedit.o: ../../../winix/winixd/core/users.h nicedit.o: ../../../winix/winixd/core/timezones.h -node.o: node.h functionbase.h ../../../winix/winixd/core/item.h -node.o: ../../../pikotools/space/space.h -node.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -node.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +node.o: node.h functionbase.h ../../../winix/winixd/db/db.h node.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h node.o: ../../../winix/winixd/db/dbtextstream.h node.o: ../../../winix/winixd/core/textstream.h -node.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +node.o: ../../../winix/winixd/core/misc.h node.o: ../../../winix/winixd/core/requesttypes.h node.o: ../../../pikotools/textstream/textstream.h +node.o: ../../../pikotools/space/space.h +node.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +node.o: ../../../pikotools/convert/inttostr.h node.o: ../../../pikotools/membuffer/membuffer.h node.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h node.o: ../../../winix/winixd/core/winix_const.h @@ -3214,6 +3276,16 @@ node.o: ../../../winix/winixd/db/dbitemcolumns.h node.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h node.o: ../../../winix/winixd/core/dircontainer.h node.o: ../../../winix/winixd/core/winixbase.h +node.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +node.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +node.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +node.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +node.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +node.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +node.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +node.o: ../../../morm/src/fieldvaluehelper.h +node.o: ../../../morm/src/flatexpression.h +node.o: ../../../winix/winixd/models/itemcontent.h node.o: ../../../winix/winixd/core/ugcontainer.h node.o: ../../../winix/winixd/core/request.h node.o: ../../../winix/winixd/core/error.h @@ -3227,15 +3299,8 @@ node.o: ../../../winix/winixd/core/winixmodel.h node.o: ../../../winix/winixd/core/plugin.h node.o: ../../../winix/winixd/core/pluginmsg.h node.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -node.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -node.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -node.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -node.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -node.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -node.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -node.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -node.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -node.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +node.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +node.o: ../../../morm/src/jsonexpression.h node.o: ../../../morm/src/postgresqlexpression.h node.o: ../../../morm/src/jsonconnector.h node.o: ../../../morm/src/postgresqlconnector.h @@ -3263,8 +3328,8 @@ node.o: ../../../pikotools/convert/patternreplacer.h node.o: ../../../winix/winixd/templates/patterns.h locale.h node.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h node.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -node.o: ../../../ezc/src/cache.h functions.h functionparser.h -node.o: ../../../winix/winixd/core/cur.h +node.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +node.o: functionparser.h ../../../winix/winixd/core/cur.h node.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h node.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h node.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -3288,17 +3353,17 @@ node.o: ../../../winix/winixd/core/basethread.h node.o: ../../../winix/winixd/notify/templatesnotify.h node.o: ../../../winix/winixd/core/users.h node.o: ../../../winix/winixd/core/timezones.h -passwd.o: passwd.h functionbase.h ../../../winix/winixd/core/item.h -passwd.o: ../../../pikotools/space/space.h -passwd.o: ../../../pikotools/textstream/types.h -passwd.o: ../../../pikotools/date/date.h -passwd.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +passwd.o: passwd.h functionbase.h ../../../winix/winixd/db/db.h passwd.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h passwd.o: ../../../winix/winixd/db/dbtextstream.h passwd.o: ../../../winix/winixd/core/textstream.h -passwd.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +passwd.o: ../../../winix/winixd/core/misc.h passwd.o: ../../../winix/winixd/core/requesttypes.h passwd.o: ../../../pikotools/textstream/textstream.h +passwd.o: ../../../pikotools/space/space.h +passwd.o: ../../../pikotools/textstream/types.h +passwd.o: ../../../pikotools/date/date.h +passwd.o: ../../../pikotools/convert/inttostr.h passwd.o: ../../../pikotools/membuffer/membuffer.h passwd.o: ../../../pikotools/textstream/types.h passwd.o: ../../../pikotools/utf8/utf8.h @@ -3326,6 +3391,16 @@ passwd.o: ../../../winix/winixd/core/user.h passwd.o: ../../../winix/winixd/core/group.h passwd.o: ../../../winix/winixd/core/dircontainer.h passwd.o: ../../../winix/winixd/core/winixbase.h +passwd.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +passwd.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +passwd.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +passwd.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +passwd.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +passwd.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +passwd.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +passwd.o: ../../../morm/src/fieldvaluehelper.h +passwd.o: ../../../morm/src/flatexpression.h +passwd.o: ../../../winix/winixd/models/itemcontent.h passwd.o: ../../../winix/winixd/core/ugcontainer.h passwd.o: ../../../winix/winixd/core/request.h passwd.o: ../../../winix/winixd/core/error.h @@ -3340,16 +3415,8 @@ passwd.o: ../../../winix/winixd/core/winixmodel.h passwd.o: ../../../winix/winixd/core/plugin.h passwd.o: ../../../winix/winixd/core/pluginmsg.h passwd.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -passwd.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -passwd.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -passwd.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -passwd.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -passwd.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -passwd.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -passwd.o: ../../../morm/src/finderhelper.h -passwd.o: ../../../morm/src/fieldvaluehelper.h -passwd.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -passwd.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +passwd.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +passwd.o: ../../../morm/src/jsonexpression.h passwd.o: ../../../morm/src/postgresqlexpression.h passwd.o: ../../../morm/src/jsonconnector.h passwd.o: ../../../morm/src/postgresqlconnector.h @@ -3379,8 +3446,9 @@ passwd.o: ../../../pikotools/convert/patternreplacer.h passwd.o: ../../../winix/winixd/templates/patterns.h locale.h passwd.o: ../../../winix/winixd/templates/localefilter.h passwd.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -passwd.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -passwd.o: functionparser.h ../../../winix/winixd/core/cur.h +passwd.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +passwd.o: ../../../ezc/src/cache.h functions.h functionparser.h +passwd.o: ../../../winix/winixd/core/cur.h passwd.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h passwd.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h passwd.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -3405,16 +3473,16 @@ passwd.o: ../../../winix/winixd/notify/templatesnotify.h passwd.o: ../../../winix/winixd/core/users.h passwd.o: ../../../winix/winixd/core/timezones.h passwd.o: ../../../winix/winixd/functions/functions.h -priv.o: priv.h functionbase.h ../../../winix/winixd/core/item.h -priv.o: ../../../pikotools/space/space.h -priv.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -priv.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +priv.o: priv.h functionbase.h ../../../winix/winixd/db/db.h priv.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h priv.o: ../../../winix/winixd/db/dbtextstream.h priv.o: ../../../winix/winixd/core/textstream.h -priv.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +priv.o: ../../../winix/winixd/core/misc.h priv.o: ../../../winix/winixd/core/requesttypes.h priv.o: ../../../pikotools/textstream/textstream.h +priv.o: ../../../pikotools/space/space.h +priv.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +priv.o: ../../../pikotools/convert/inttostr.h priv.o: ../../../pikotools/membuffer/membuffer.h priv.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h priv.o: ../../../winix/winixd/core/winix_const.h @@ -3439,6 +3507,16 @@ priv.o: ../../../winix/winixd/db/dbitemcolumns.h priv.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h priv.o: ../../../winix/winixd/core/dircontainer.h priv.o: ../../../winix/winixd/core/winixbase.h +priv.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +priv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +priv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +priv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +priv.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +priv.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +priv.o: ../../../morm/src/fieldvaluehelper.h +priv.o: ../../../morm/src/flatexpression.h +priv.o: ../../../winix/winixd/models/itemcontent.h priv.o: ../../../winix/winixd/core/ugcontainer.h priv.o: ../../../winix/winixd/core/request.h priv.o: ../../../winix/winixd/core/error.h @@ -3452,15 +3530,8 @@ priv.o: ../../../winix/winixd/core/winixmodel.h priv.o: ../../../winix/winixd/core/plugin.h priv.o: ../../../winix/winixd/core/pluginmsg.h priv.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -priv.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -priv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -priv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -priv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -priv.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -priv.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -priv.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -priv.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +priv.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +priv.o: ../../../morm/src/jsonexpression.h priv.o: ../../../morm/src/postgresqlexpression.h priv.o: ../../../morm/src/jsonconnector.h priv.o: ../../../morm/src/postgresqlconnector.h @@ -3488,8 +3559,8 @@ priv.o: ../../../pikotools/convert/patternreplacer.h priv.o: ../../../winix/winixd/templates/patterns.h locale.h priv.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h priv.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -priv.o: ../../../ezc/src/cache.h functions.h functionparser.h -priv.o: ../../../winix/winixd/core/cur.h +priv.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +priv.o: functionparser.h ../../../winix/winixd/core/cur.h priv.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h priv.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h priv.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -3522,7 +3593,20 @@ privchanger.o: ../../../pikotools/date/date.h privchanger.o: ../../../pikotools/convert/inttostr.h privchanger.o: ../../../pikotools/membuffer/membuffer.h privchanger.o: ../../../pikotools/textstream/types.h -privchanger.o: ../../../winix/winixd/core/item.h +privchanger.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +privchanger.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +privchanger.o: ../../../morm/src/dbconnector.h ../../../pikotools/log/log.h +privchanger.o: ../../../pikotools/log/filelog.h +privchanger.o: ../../../morm/src/queryresult.h +privchanger.o: ../../../morm/src/flatconnector.h +privchanger.o: ../../../morm/src/dbexpression.h +privchanger.o: ../../../morm/src/baseexpression.h +privchanger.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +privchanger.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +privchanger.o: ../../../morm/src/finderhelper.h +privchanger.o: ../../../morm/src/fieldvaluehelper.h +privchanger.o: ../../../morm/src/flatexpression.h +privchanger.o: ../../../winix/winixd/models/itemcontent.h privchanger.o: ../../../winix/winixd/core/error.h privchanger.o: ../../../winix/winixd/core/config.h privchanger.o: ../../../winix/winixd/core/textstream.h @@ -3548,7 +3632,6 @@ privchanger.o: ../../../winix/winixd/core/config.h privchanger.o: ../../../pikotools/space/spaceparser.h privchanger.o: ../../../winix/winixd/core/log.h privchanger.o: ../../../winix/winixd/core/logmanipulators.h -privchanger.o: ../../../pikotools/log/log.h ../../../pikotools/log/filelog.h privchanger.o: ../../../winix/winixd/core/log.h privchanger.o: ../../../winix/winixd/core/synchro.h privchanger.o: ../../../winix/winixd/core/filelog.h @@ -3557,18 +3640,7 @@ privchanger.o: ../../../winix/winixd/core/plugin.h privchanger.o: ../../../winix/winixd/core/pluginmsg.h privchanger.o: ../../../winix/winixd/core/plugindata.h privchanger.o: ../../../winix/winixd/core/winixbase.h -privchanger.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -privchanger.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -privchanger.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -privchanger.o: ../../../morm/src/queryresult.h -privchanger.o: ../../../morm/src/flatconnector.h -privchanger.o: ../../../morm/src/dbexpression.h -privchanger.o: ../../../morm/src/baseexpression.h -privchanger.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -privchanger.o: ../../../morm/src/cursorhelper.h -privchanger.o: ../../../morm/src/finderhelper.h -privchanger.o: ../../../morm/src/fieldvaluehelper.h -privchanger.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h +privchanger.o: ../../../morm/src/morm.h ../../../morm/src/finder.h privchanger.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h privchanger.o: ../../../morm/src/postgresqlexpression.h privchanger.o: ../../../morm/src/jsonconnector.h @@ -3582,7 +3654,6 @@ privchanger.o: ../../../winix/winixd/db/dbconn.h privchanger.o: ../../../winix/winixd/db/dbtextstream.h privchanger.o: ../../../winix/winixd/core/error.h privchanger.o: ../../../winix/winixd/db/dbitemquery.h -privchanger.o: ../../../winix/winixd/core/item.h privchanger.o: ../../../winix/winixd/db/dbitemcolumns.h privchanger.o: ../../../winix/winixd/core/user.h privchanger.o: ../../../winix/winixd/core/group.h @@ -3597,8 +3668,9 @@ privchanger.o: ../../../pikotools/convert/patternreplacer.h privchanger.o: ../../../winix/winixd/templates/patterns.h locale.h privchanger.o: ../../../winix/winixd/templates/localefilter.h privchanger.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -privchanger.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -privchanger.o: functionparser.h ../../../winix/winixd/core/cur.h +privchanger.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +privchanger.o: ../../../ezc/src/cache.h functions.h functionparser.h +privchanger.o: ../../../winix/winixd/core/cur.h privchanger.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h privchanger.o: cat.h chmod.h chown.h ckeditor.h cp.h default.h download.h privchanger.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h @@ -3637,16 +3709,15 @@ privchanger.o: ../../../winix/winixd/core/loadavg.h privchanger.o: ../../../winix/winixd/core/image.h privchanger.o: ../../../winix/winixd/core/threadmanager.h privchanger.o: ../../../winix/winixd/core/timezones.h -pw.o: pw.h functionbase.h ../../../winix/winixd/core/item.h -pw.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -pw.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -pw.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -pw.o: ../../../winix/winixd/db/dbconn.h +pw.o: pw.h functionbase.h ../../../winix/winixd/db/db.h +pw.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h pw.o: ../../../winix/winixd/db/dbtextstream.h pw.o: ../../../winix/winixd/core/textstream.h -pw.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +pw.o: ../../../winix/winixd/core/misc.h pw.o: ../../../winix/winixd/core/requesttypes.h pw.o: ../../../pikotools/textstream/textstream.h +pw.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +pw.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h pw.o: ../../../pikotools/membuffer/membuffer.h pw.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h pw.o: ../../../winix/winixd/core/winix_const.h @@ -3668,6 +3739,15 @@ pw.o: ../../../winix/winixd/db/dbitemcolumns.h pw.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h pw.o: ../../../winix/winixd/core/dircontainer.h pw.o: ../../../winix/winixd/core/winixbase.h +pw.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +pw.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +pw.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +pw.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +pw.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +pw.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +pw.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +pw.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/flatexpression.h +pw.o: ../../../winix/winixd/models/itemcontent.h pw.o: ../../../winix/winixd/core/ugcontainer.h pw.o: ../../../winix/winixd/core/request.h ../../../winix/winixd/core/error.h pw.o: ../../../winix/winixd/core/config.h @@ -3680,15 +3760,8 @@ pw.o: ../../../winix/winixd/core/winixmodel.h pw.o: ../../../winix/winixd/core/plugin.h pw.o: ../../../winix/winixd/core/pluginmsg.h pw.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -pw.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -pw.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -pw.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -pw.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -pw.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -pw.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -pw.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -pw.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -pw.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +pw.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +pw.o: ../../../morm/src/jsonexpression.h pw.o: ../../../morm/src/postgresqlexpression.h pw.o: ../../../morm/src/jsonconnector.h pw.o: ../../../morm/src/postgresqlconnector.h @@ -3714,8 +3787,8 @@ pw.o: ../../../pikotools/convert/patternreplacer.h pw.o: ../../../winix/winixd/templates/patterns.h locale.h pw.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h pw.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -pw.o: ../../../ezc/src/cache.h functions.h functionparser.h -pw.o: ../../../winix/winixd/core/cur.h +pw.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +pw.o: functionparser.h ../../../winix/winixd/core/cur.h pw.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h pw.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h pw.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -3740,17 +3813,17 @@ pw.o: ../../../winix/winixd/notify/templatesnotify.h pw.o: ../../../winix/winixd/core/users.h pw.o: ../../../winix/winixd/core/timezones.h pw.o: ../../../winix/winixd/core/misc.h -reload.o: reload.h functionbase.h ../../../winix/winixd/core/item.h -reload.o: ../../../pikotools/space/space.h -reload.o: ../../../pikotools/textstream/types.h -reload.o: ../../../pikotools/date/date.h -reload.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +reload.o: reload.h functionbase.h ../../../winix/winixd/db/db.h reload.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h reload.o: ../../../winix/winixd/db/dbtextstream.h reload.o: ../../../winix/winixd/core/textstream.h -reload.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +reload.o: ../../../winix/winixd/core/misc.h reload.o: ../../../winix/winixd/core/requesttypes.h reload.o: ../../../pikotools/textstream/textstream.h +reload.o: ../../../pikotools/space/space.h +reload.o: ../../../pikotools/textstream/types.h +reload.o: ../../../pikotools/date/date.h +reload.o: ../../../pikotools/convert/inttostr.h reload.o: ../../../pikotools/membuffer/membuffer.h reload.o: ../../../pikotools/textstream/types.h reload.o: ../../../pikotools/utf8/utf8.h @@ -3778,6 +3851,16 @@ reload.o: ../../../winix/winixd/core/user.h reload.o: ../../../winix/winixd/core/group.h reload.o: ../../../winix/winixd/core/dircontainer.h reload.o: ../../../winix/winixd/core/winixbase.h +reload.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +reload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +reload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +reload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +reload.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +reload.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +reload.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +reload.o: ../../../morm/src/fieldvaluehelper.h +reload.o: ../../../morm/src/flatexpression.h +reload.o: ../../../winix/winixd/models/itemcontent.h reload.o: ../../../winix/winixd/core/ugcontainer.h reload.o: ../../../winix/winixd/core/request.h reload.o: ../../../winix/winixd/core/error.h @@ -3792,16 +3875,8 @@ reload.o: ../../../winix/winixd/core/winixmodel.h reload.o: ../../../winix/winixd/core/plugin.h reload.o: ../../../winix/winixd/core/pluginmsg.h reload.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -reload.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -reload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -reload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -reload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -reload.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -reload.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -reload.o: ../../../morm/src/finderhelper.h -reload.o: ../../../morm/src/fieldvaluehelper.h -reload.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -reload.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +reload.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +reload.o: ../../../morm/src/jsonexpression.h reload.o: ../../../morm/src/postgresqlexpression.h reload.o: ../../../morm/src/jsonconnector.h reload.o: ../../../morm/src/postgresqlconnector.h @@ -3831,8 +3906,9 @@ reload.o: ../../../pikotools/convert/patternreplacer.h reload.o: ../../../winix/winixd/templates/patterns.h locale.h reload.o: ../../../winix/winixd/templates/localefilter.h reload.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -reload.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -reload.o: functionparser.h ../../../winix/winixd/core/cur.h +reload.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +reload.o: ../../../ezc/src/cache.h functions.h functionparser.h +reload.o: ../../../winix/winixd/core/cur.h reload.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h reload.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h reload.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -3862,16 +3938,15 @@ reload.o: ../../../winix/winixd/templates/indexpatterns.h reload.o: ../../../winix/winixd/templates/patterns.h reload.o: ../../../winix/winixd/templates/changepatterns.h reload.o: ../../../winix/winixd/templates/htmltextstream.h -rm.o: rm.h functionbase.h ../../../winix/winixd/core/item.h -rm.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -rm.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -rm.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -rm.o: ../../../winix/winixd/db/dbconn.h +rm.o: rm.h functionbase.h ../../../winix/winixd/db/db.h +rm.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h rm.o: ../../../winix/winixd/db/dbtextstream.h rm.o: ../../../winix/winixd/core/textstream.h -rm.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +rm.o: ../../../winix/winixd/core/misc.h rm.o: ../../../winix/winixd/core/requesttypes.h rm.o: ../../../pikotools/textstream/textstream.h +rm.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +rm.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h rm.o: ../../../pikotools/membuffer/membuffer.h rm.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h rm.o: ../../../winix/winixd/core/winix_const.h @@ -3893,6 +3968,15 @@ rm.o: ../../../winix/winixd/db/dbitemcolumns.h rm.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h rm.o: ../../../winix/winixd/core/dircontainer.h rm.o: ../../../winix/winixd/core/winixbase.h +rm.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +rm.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +rm.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +rm.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +rm.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +rm.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +rm.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +rm.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/flatexpression.h +rm.o: ../../../winix/winixd/models/itemcontent.h rm.o: ../../../winix/winixd/core/ugcontainer.h rm.o: ../../../winix/winixd/core/request.h ../../../winix/winixd/core/error.h rm.o: ../../../winix/winixd/core/config.h @@ -3905,15 +3989,8 @@ rm.o: ../../../winix/winixd/core/winixmodel.h rm.o: ../../../winix/winixd/core/plugin.h rm.o: ../../../winix/winixd/core/pluginmsg.h rm.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -rm.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -rm.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -rm.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -rm.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -rm.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -rm.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -rm.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -rm.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -rm.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +rm.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +rm.o: ../../../morm/src/jsonexpression.h rm.o: ../../../morm/src/postgresqlexpression.h rm.o: ../../../morm/src/jsonconnector.h rm.o: ../../../morm/src/postgresqlconnector.h @@ -3939,8 +4016,8 @@ rm.o: ../../../pikotools/convert/patternreplacer.h rm.o: ../../../winix/winixd/templates/patterns.h locale.h rm.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h rm.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -rm.o: ../../../ezc/src/cache.h functions.h functionparser.h -rm.o: ../../../winix/winixd/core/cur.h +rm.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +rm.o: functionparser.h ../../../winix/winixd/core/cur.h rm.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h rm.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h rm.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -3971,17 +4048,17 @@ rm.o: ../../../winix/winixd/templates/indexpatterns.h rm.o: ../../../winix/winixd/templates/patterns.h rm.o: ../../../winix/winixd/templates/changepatterns.h rm.o: ../../../winix/winixd/templates/htmltextstream.h -rmuser.o: rmuser.h functionbase.h ../../../winix/winixd/core/item.h -rmuser.o: ../../../pikotools/space/space.h -rmuser.o: ../../../pikotools/textstream/types.h -rmuser.o: ../../../pikotools/date/date.h -rmuser.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +rmuser.o: rmuser.h functionbase.h ../../../winix/winixd/db/db.h rmuser.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h rmuser.o: ../../../winix/winixd/db/dbtextstream.h rmuser.o: ../../../winix/winixd/core/textstream.h -rmuser.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +rmuser.o: ../../../winix/winixd/core/misc.h rmuser.o: ../../../winix/winixd/core/requesttypes.h rmuser.o: ../../../pikotools/textstream/textstream.h +rmuser.o: ../../../pikotools/space/space.h +rmuser.o: ../../../pikotools/textstream/types.h +rmuser.o: ../../../pikotools/date/date.h +rmuser.o: ../../../pikotools/convert/inttostr.h rmuser.o: ../../../pikotools/membuffer/membuffer.h rmuser.o: ../../../pikotools/textstream/types.h rmuser.o: ../../../pikotools/utf8/utf8.h @@ -4009,6 +4086,16 @@ rmuser.o: ../../../winix/winixd/core/user.h rmuser.o: ../../../winix/winixd/core/group.h rmuser.o: ../../../winix/winixd/core/dircontainer.h rmuser.o: ../../../winix/winixd/core/winixbase.h +rmuser.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +rmuser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +rmuser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +rmuser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +rmuser.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +rmuser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +rmuser.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +rmuser.o: ../../../morm/src/fieldvaluehelper.h +rmuser.o: ../../../morm/src/flatexpression.h +rmuser.o: ../../../winix/winixd/models/itemcontent.h rmuser.o: ../../../winix/winixd/core/ugcontainer.h rmuser.o: ../../../winix/winixd/core/request.h rmuser.o: ../../../winix/winixd/core/error.h @@ -4023,16 +4110,8 @@ rmuser.o: ../../../winix/winixd/core/winixmodel.h rmuser.o: ../../../winix/winixd/core/plugin.h rmuser.o: ../../../winix/winixd/core/pluginmsg.h rmuser.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -rmuser.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -rmuser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -rmuser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -rmuser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -rmuser.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -rmuser.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -rmuser.o: ../../../morm/src/finderhelper.h -rmuser.o: ../../../morm/src/fieldvaluehelper.h -rmuser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -rmuser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +rmuser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +rmuser.o: ../../../morm/src/jsonexpression.h rmuser.o: ../../../morm/src/postgresqlexpression.h rmuser.o: ../../../morm/src/jsonconnector.h rmuser.o: ../../../morm/src/postgresqlconnector.h @@ -4062,8 +4141,9 @@ rmuser.o: ../../../pikotools/convert/patternreplacer.h rmuser.o: ../../../winix/winixd/templates/patterns.h locale.h rmuser.o: ../../../winix/winixd/templates/localefilter.h rmuser.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -rmuser.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -rmuser.o: functionparser.h ../../../winix/winixd/core/cur.h +rmuser.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +rmuser.o: ../../../ezc/src/cache.h functions.h functionparser.h +rmuser.o: ../../../winix/winixd/core/cur.h rmuser.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h rmuser.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h rmuser.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -4090,16 +4170,15 @@ rmuser.o: ../../../winix/winixd/core/timezones.h rmuser.o: ../../../winix/winixd/core/misc.h rmuser.o: ../../../winix/winixd/core/plugin.h rmuser.o: ../../../winix/winixd/functions/functions.h -run.o: run.h functionbase.h ../../../winix/winixd/core/item.h -run.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -run.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -run.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -run.o: ../../../winix/winixd/db/dbconn.h +run.o: run.h functionbase.h ../../../winix/winixd/db/db.h +run.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h run.o: ../../../winix/winixd/db/dbtextstream.h run.o: ../../../winix/winixd/core/textstream.h -run.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +run.o: ../../../winix/winixd/core/misc.h run.o: ../../../winix/winixd/core/requesttypes.h run.o: ../../../pikotools/textstream/textstream.h +run.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +run.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h run.o: ../../../pikotools/membuffer/membuffer.h run.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h run.o: ../../../winix/winixd/core/winix_const.h @@ -4123,6 +4202,16 @@ run.o: ../../../winix/winixd/db/dbitemcolumns.h run.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h run.o: ../../../winix/winixd/core/dircontainer.h run.o: ../../../winix/winixd/core/winixbase.h +run.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +run.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +run.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +run.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +run.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +run.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +run.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +run.o: ../../../morm/src/fieldvaluehelper.h +run.o: ../../../morm/src/flatexpression.h +run.o: ../../../winix/winixd/models/itemcontent.h run.o: ../../../winix/winixd/core/ugcontainer.h run.o: ../../../winix/winixd/core/request.h run.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h @@ -4135,15 +4224,8 @@ run.o: ../../../winix/winixd/core/winixmodel.h run.o: ../../../winix/winixd/core/plugin.h run.o: ../../../winix/winixd/core/pluginmsg.h run.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -run.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -run.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -run.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -run.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -run.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -run.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -run.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -run.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -run.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +run.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +run.o: ../../../morm/src/jsonexpression.h run.o: ../../../morm/src/postgresqlexpression.h run.o: ../../../morm/src/jsonconnector.h run.o: ../../../morm/src/postgresqlconnector.h @@ -4170,8 +4252,8 @@ run.o: ../../../pikotools/convert/patternreplacer.h run.o: ../../../winix/winixd/templates/patterns.h locale.h run.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h run.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -run.o: ../../../ezc/src/cache.h functions.h functionparser.h -run.o: ../../../winix/winixd/core/cur.h +run.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +run.o: functionparser.h ../../../winix/winixd/core/cur.h run.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h run.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h run.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -4195,16 +4277,16 @@ run.o: ../../../winix/winixd/core/basethread.h run.o: ../../../winix/winixd/notify/templatesnotify.h run.o: ../../../winix/winixd/core/users.h run.o: ../../../winix/winixd/core/timezones.h -sort.o: sort.h functionbase.h ../../../winix/winixd/core/item.h -sort.o: ../../../pikotools/space/space.h -sort.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -sort.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +sort.o: sort.h functionbase.h ../../../winix/winixd/db/db.h sort.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h sort.o: ../../../winix/winixd/db/dbtextstream.h sort.o: ../../../winix/winixd/core/textstream.h -sort.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +sort.o: ../../../winix/winixd/core/misc.h sort.o: ../../../winix/winixd/core/requesttypes.h sort.o: ../../../pikotools/textstream/textstream.h +sort.o: ../../../pikotools/space/space.h +sort.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +sort.o: ../../../pikotools/convert/inttostr.h sort.o: ../../../pikotools/membuffer/membuffer.h sort.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h sort.o: ../../../winix/winixd/core/winix_const.h @@ -4229,6 +4311,16 @@ sort.o: ../../../winix/winixd/db/dbitemcolumns.h sort.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h sort.o: ../../../winix/winixd/core/dircontainer.h sort.o: ../../../winix/winixd/core/winixbase.h +sort.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +sort.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +sort.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +sort.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +sort.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +sort.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +sort.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +sort.o: ../../../morm/src/fieldvaluehelper.h +sort.o: ../../../morm/src/flatexpression.h +sort.o: ../../../winix/winixd/models/itemcontent.h sort.o: ../../../winix/winixd/core/ugcontainer.h sort.o: ../../../winix/winixd/core/request.h sort.o: ../../../winix/winixd/core/error.h @@ -4242,15 +4334,8 @@ sort.o: ../../../winix/winixd/core/winixmodel.h sort.o: ../../../winix/winixd/core/plugin.h sort.o: ../../../winix/winixd/core/pluginmsg.h sort.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -sort.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -sort.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -sort.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -sort.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -sort.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -sort.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -sort.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -sort.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -sort.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +sort.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +sort.o: ../../../morm/src/jsonexpression.h sort.o: ../../../morm/src/postgresqlexpression.h sort.o: ../../../morm/src/jsonconnector.h sort.o: ../../../morm/src/postgresqlconnector.h @@ -4278,8 +4363,8 @@ sort.o: ../../../pikotools/convert/patternreplacer.h sort.o: ../../../winix/winixd/templates/patterns.h locale.h sort.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h sort.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -sort.o: ../../../ezc/src/cache.h functions.h functionparser.h -sort.o: ../../../winix/winixd/core/cur.h +sort.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +sort.o: functionparser.h ../../../winix/winixd/core/cur.h sort.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h sort.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h sort.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -4305,20 +4390,18 @@ sort.o: ../../../winix/winixd/core/users.h sort.o: ../../../winix/winixd/core/timezones.h sort.o: ../../../winix/winixd/core/plugin.h specialdefault.o: specialdefault.h functionbase.h -specialdefault.o: ../../../winix/winixd/core/item.h -specialdefault.o: ../../../pikotools/space/space.h -specialdefault.o: ../../../pikotools/textstream/types.h -specialdefault.o: ../../../pikotools/date/date.h -specialdefault.o: ../../../pikotools/convert/inttostr.h specialdefault.o: ../../../winix/winixd/db/db.h specialdefault.o: ../../../winix/winixd/db/dbbase.h specialdefault.o: ../../../winix/winixd/db/dbconn.h specialdefault.o: ../../../winix/winixd/db/dbtextstream.h specialdefault.o: ../../../winix/winixd/core/textstream.h specialdefault.o: ../../../winix/winixd/core/misc.h -specialdefault.o: ../../../winix/winixd/core/item.h specialdefault.o: ../../../winix/winixd/core/requesttypes.h specialdefault.o: ../../../pikotools/textstream/textstream.h +specialdefault.o: ../../../pikotools/space/space.h +specialdefault.o: ../../../pikotools/textstream/types.h +specialdefault.o: ../../../pikotools/date/date.h +specialdefault.o: ../../../pikotools/convert/inttostr.h specialdefault.o: ../../../pikotools/membuffer/membuffer.h specialdefault.o: ../../../pikotools/textstream/types.h specialdefault.o: ../../../pikotools/utf8/utf8.h @@ -4348,6 +4431,21 @@ specialdefault.o: ../../../winix/winixd/core/user.h specialdefault.o: ../../../winix/winixd/core/group.h specialdefault.o: ../../../winix/winixd/core/dircontainer.h specialdefault.o: ../../../winix/winixd/core/winixbase.h +specialdefault.o: ../../../winix/winixd/models/item.h +specialdefault.o: ../../../morm/src/model.h +specialdefault.o: ../../../morm/src/modelconnector.h +specialdefault.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h +specialdefault.o: ../../../morm/src/queryresult.h +specialdefault.o: ../../../morm/src/flatconnector.h +specialdefault.o: ../../../morm/src/dbexpression.h +specialdefault.o: ../../../morm/src/baseexpression.h +specialdefault.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +specialdefault.o: ../../../morm/src/modeldata.h +specialdefault.o: ../../../morm/src/cursorhelper.h +specialdefault.o: ../../../morm/src/finderhelper.h +specialdefault.o: ../../../morm/src/fieldvaluehelper.h +specialdefault.o: ../../../morm/src/flatexpression.h +specialdefault.o: ../../../winix/winixd/models/itemcontent.h specialdefault.o: ../../../winix/winixd/core/ugcontainer.h specialdefault.o: ../../../winix/winixd/core/request.h specialdefault.o: ../../../winix/winixd/core/error.h @@ -4363,20 +4461,8 @@ specialdefault.o: ../../../winix/winixd/core/winixmodel.h specialdefault.o: ../../../winix/winixd/core/plugin.h specialdefault.o: ../../../winix/winixd/core/pluginmsg.h specialdefault.o: ../../../winix/winixd/core/plugindata.h -specialdefault.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -specialdefault.o: ../../../morm/src/model.h -specialdefault.o: ../../../morm/src/modelconnector.h -specialdefault.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -specialdefault.o: ../../../morm/src/queryresult.h -specialdefault.o: ../../../morm/src/flatconnector.h -specialdefault.o: ../../../morm/src/dbexpression.h -specialdefault.o: ../../../morm/src/baseexpression.h -specialdefault.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -specialdefault.o: ../../../morm/src/cursorhelper.h -specialdefault.o: ../../../morm/src/finderhelper.h -specialdefault.o: ../../../morm/src/fieldvaluehelper.h -specialdefault.o: ../../../morm/src/flatexpression.h -specialdefault.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +specialdefault.o: ../../../morm/src/morm.h ../../../morm/src/finder.h +specialdefault.o: ../../../morm/src/cursor.h specialdefault.o: ../../../morm/src/jsonexpression.h specialdefault.o: ../../../morm/src/postgresqlexpression.h specialdefault.o: ../../../morm/src/jsonconnector.h @@ -4407,8 +4493,8 @@ specialdefault.o: ../../../pikotools/convert/patternreplacer.h specialdefault.o: ../../../winix/winixd/templates/patterns.h locale.h specialdefault.o: ../../../winix/winixd/templates/localefilter.h specialdefault.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -specialdefault.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h -specialdefault.o: functions.h functionparser.h +specialdefault.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +specialdefault.o: ../../../ezc/src/cache.h functions.h functionparser.h specialdefault.o: ../../../winix/winixd/core/cur.h specialdefault.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h specialdefault.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h @@ -4435,16 +4521,16 @@ specialdefault.o: ../../../winix/winixd/core/basethread.h specialdefault.o: ../../../winix/winixd/notify/templatesnotify.h specialdefault.o: ../../../winix/winixd/core/users.h specialdefault.o: ../../../winix/winixd/core/timezones.h -stat.o: stat.h functionbase.h ../../../winix/winixd/core/item.h -stat.o: ../../../pikotools/space/space.h -stat.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -stat.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +stat.o: stat.h functionbase.h ../../../winix/winixd/db/db.h stat.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h stat.o: ../../../winix/winixd/db/dbtextstream.h stat.o: ../../../winix/winixd/core/textstream.h -stat.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +stat.o: ../../../winix/winixd/core/misc.h stat.o: ../../../winix/winixd/core/requesttypes.h stat.o: ../../../pikotools/textstream/textstream.h +stat.o: ../../../pikotools/space/space.h +stat.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +stat.o: ../../../pikotools/convert/inttostr.h stat.o: ../../../pikotools/membuffer/membuffer.h stat.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h stat.o: ../../../winix/winixd/core/winix_const.h @@ -4469,6 +4555,16 @@ stat.o: ../../../winix/winixd/db/dbitemcolumns.h stat.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h stat.o: ../../../winix/winixd/core/dircontainer.h stat.o: ../../../winix/winixd/core/winixbase.h +stat.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +stat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +stat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +stat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +stat.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +stat.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +stat.o: ../../../morm/src/fieldvaluehelper.h +stat.o: ../../../morm/src/flatexpression.h +stat.o: ../../../winix/winixd/models/itemcontent.h stat.o: ../../../winix/winixd/core/ugcontainer.h stat.o: ../../../winix/winixd/core/request.h stat.o: ../../../winix/winixd/core/error.h @@ -4482,15 +4578,8 @@ stat.o: ../../../winix/winixd/core/winixmodel.h stat.o: ../../../winix/winixd/core/plugin.h stat.o: ../../../winix/winixd/core/pluginmsg.h stat.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -stat.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -stat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -stat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -stat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -stat.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -stat.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -stat.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -stat.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +stat.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +stat.o: ../../../morm/src/jsonexpression.h stat.o: ../../../morm/src/postgresqlexpression.h stat.o: ../../../morm/src/jsonconnector.h stat.o: ../../../morm/src/postgresqlconnector.h @@ -4518,8 +4607,8 @@ stat.o: ../../../pikotools/convert/patternreplacer.h stat.o: ../../../winix/winixd/templates/patterns.h locale.h stat.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h stat.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -stat.o: ../../../ezc/src/cache.h functions.h functionparser.h -stat.o: ../../../winix/winixd/core/cur.h +stat.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +stat.o: functionparser.h ../../../winix/winixd/core/cur.h stat.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h stat.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h stat.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -4543,19 +4632,18 @@ stat.o: ../../../winix/winixd/core/basethread.h stat.o: ../../../winix/winixd/notify/templatesnotify.h stat.o: ../../../winix/winixd/core/users.h stat.o: ../../../winix/winixd/core/timezones.h -subject.o: subject.h functionbase.h ../../../winix/winixd/core/item.h -subject.o: ../../../pikotools/space/space.h -subject.o: ../../../pikotools/textstream/types.h -subject.o: ../../../pikotools/date/date.h -subject.o: ../../../pikotools/convert/inttostr.h -subject.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +subject.o: subject.h functionbase.h ../../../winix/winixd/db/db.h +subject.o: ../../../winix/winixd/db/dbbase.h subject.o: ../../../winix/winixd/db/dbconn.h subject.o: ../../../winix/winixd/db/dbtextstream.h subject.o: ../../../winix/winixd/core/textstream.h subject.o: ../../../winix/winixd/core/misc.h -subject.o: ../../../winix/winixd/core/item.h subject.o: ../../../winix/winixd/core/requesttypes.h subject.o: ../../../pikotools/textstream/textstream.h +subject.o: ../../../pikotools/space/space.h +subject.o: ../../../pikotools/textstream/types.h +subject.o: ../../../pikotools/date/date.h +subject.o: ../../../pikotools/convert/inttostr.h subject.o: ../../../pikotools/membuffer/membuffer.h subject.o: ../../../pikotools/textstream/types.h subject.o: ../../../pikotools/utf8/utf8.h @@ -4583,6 +4671,16 @@ subject.o: ../../../winix/winixd/core/user.h subject.o: ../../../winix/winixd/core/group.h subject.o: ../../../winix/winixd/core/dircontainer.h subject.o: ../../../winix/winixd/core/winixbase.h +subject.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +subject.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +subject.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +subject.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +subject.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +subject.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +subject.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +subject.o: ../../../morm/src/fieldvaluehelper.h +subject.o: ../../../morm/src/flatexpression.h +subject.o: ../../../winix/winixd/models/itemcontent.h subject.o: ../../../winix/winixd/core/ugcontainer.h subject.o: ../../../winix/winixd/core/request.h subject.o: ../../../winix/winixd/core/error.h @@ -4597,16 +4695,8 @@ subject.o: ../../../winix/winixd/core/winixmodel.h subject.o: ../../../winix/winixd/core/plugin.h subject.o: ../../../winix/winixd/core/pluginmsg.h subject.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -subject.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -subject.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -subject.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -subject.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -subject.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -subject.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -subject.o: ../../../morm/src/finderhelper.h -subject.o: ../../../morm/src/fieldvaluehelper.h -subject.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -subject.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +subject.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +subject.o: ../../../morm/src/jsonexpression.h subject.o: ../../../morm/src/postgresqlexpression.h subject.o: ../../../morm/src/jsonconnector.h subject.o: ../../../morm/src/postgresqlconnector.h @@ -4636,8 +4726,9 @@ subject.o: ../../../pikotools/convert/patternreplacer.h subject.o: ../../../winix/winixd/templates/patterns.h locale.h subject.o: ../../../winix/winixd/templates/localefilter.h subject.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -subject.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -subject.o: functionparser.h ../../../winix/winixd/core/cur.h +subject.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +subject.o: ../../../ezc/src/cache.h functions.h functionparser.h +subject.o: ../../../winix/winixd/core/cur.h subject.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h subject.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h subject.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -4661,19 +4752,18 @@ subject.o: ../../../winix/winixd/core/basethread.h subject.o: ../../../winix/winixd/notify/templatesnotify.h subject.o: ../../../winix/winixd/core/users.h subject.o: ../../../winix/winixd/core/timezones.h -template.o: template.h functionbase.h ../../../winix/winixd/core/item.h -template.o: ../../../pikotools/space/space.h -template.o: ../../../pikotools/textstream/types.h -template.o: ../../../pikotools/date/date.h -template.o: ../../../pikotools/convert/inttostr.h -template.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +template.o: template.h functionbase.h ../../../winix/winixd/db/db.h +template.o: ../../../winix/winixd/db/dbbase.h template.o: ../../../winix/winixd/db/dbconn.h template.o: ../../../winix/winixd/db/dbtextstream.h template.o: ../../../winix/winixd/core/textstream.h template.o: ../../../winix/winixd/core/misc.h -template.o: ../../../winix/winixd/core/item.h template.o: ../../../winix/winixd/core/requesttypes.h template.o: ../../../pikotools/textstream/textstream.h +template.o: ../../../pikotools/space/space.h +template.o: ../../../pikotools/textstream/types.h +template.o: ../../../pikotools/date/date.h +template.o: ../../../pikotools/convert/inttostr.h template.o: ../../../pikotools/membuffer/membuffer.h template.o: ../../../pikotools/textstream/types.h template.o: ../../../pikotools/utf8/utf8.h @@ -4701,6 +4791,17 @@ template.o: ../../../winix/winixd/core/user.h template.o: ../../../winix/winixd/core/group.h template.o: ../../../winix/winixd/core/dircontainer.h template.o: ../../../winix/winixd/core/winixbase.h +template.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +template.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +template.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +template.o: ../../../morm/src/flatconnector.h +template.o: ../../../morm/src/dbexpression.h +template.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +template.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +template.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +template.o: ../../../morm/src/fieldvaluehelper.h +template.o: ../../../morm/src/flatexpression.h +template.o: ../../../winix/winixd/models/itemcontent.h template.o: ../../../winix/winixd/core/ugcontainer.h template.o: ../../../winix/winixd/core/request.h template.o: ../../../winix/winixd/core/error.h @@ -4715,17 +4816,8 @@ template.o: ../../../winix/winixd/core/winixmodel.h template.o: ../../../winix/winixd/core/plugin.h template.o: ../../../winix/winixd/core/pluginmsg.h template.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -template.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -template.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -template.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -template.o: ../../../morm/src/flatconnector.h -template.o: ../../../morm/src/dbexpression.h -template.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -template.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -template.o: ../../../morm/src/finderhelper.h -template.o: ../../../morm/src/fieldvaluehelper.h -template.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -template.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +template.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +template.o: ../../../morm/src/jsonexpression.h template.o: ../../../morm/src/postgresqlexpression.h template.o: ../../../morm/src/jsonconnector.h template.o: ../../../morm/src/postgresqlconnector.h @@ -4755,8 +4847,9 @@ template.o: ../../../pikotools/convert/patternreplacer.h template.o: ../../../winix/winixd/templates/patterns.h locale.h template.o: ../../../winix/winixd/templates/localefilter.h template.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -template.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -template.o: functionparser.h ../../../winix/winixd/core/cur.h +template.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +template.o: ../../../ezc/src/cache.h functions.h functionparser.h +template.o: ../../../winix/winixd/core/cur.h template.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h template.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h template.o: download.h emacs.h env.h imgcrop.h last.h login.h logout.h ln.h @@ -4781,19 +4874,18 @@ template.o: ../../../winix/winixd/notify/templatesnotify.h template.o: ../../../winix/winixd/core/users.h template.o: ../../../winix/winixd/core/timezones.h template.o: ../../../winix/winixd/core/misc.h -timezone.o: timezone.h functionbase.h ../../../winix/winixd/core/item.h -timezone.o: ../../../pikotools/space/space.h -timezone.o: ../../../pikotools/textstream/types.h -timezone.o: ../../../pikotools/date/date.h -timezone.o: ../../../pikotools/convert/inttostr.h -timezone.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +timezone.o: timezone.h functionbase.h ../../../winix/winixd/db/db.h +timezone.o: ../../../winix/winixd/db/dbbase.h timezone.o: ../../../winix/winixd/db/dbconn.h timezone.o: ../../../winix/winixd/db/dbtextstream.h timezone.o: ../../../winix/winixd/core/textstream.h timezone.o: ../../../winix/winixd/core/misc.h -timezone.o: ../../../winix/winixd/core/item.h timezone.o: ../../../winix/winixd/core/requesttypes.h timezone.o: ../../../pikotools/textstream/textstream.h +timezone.o: ../../../pikotools/space/space.h +timezone.o: ../../../pikotools/textstream/types.h +timezone.o: ../../../pikotools/date/date.h +timezone.o: ../../../pikotools/convert/inttostr.h timezone.o: ../../../pikotools/membuffer/membuffer.h timezone.o: ../../../pikotools/textstream/types.h timezone.o: ../../../pikotools/utf8/utf8.h @@ -4821,6 +4913,17 @@ timezone.o: ../../../winix/winixd/core/user.h timezone.o: ../../../winix/winixd/core/group.h timezone.o: ../../../winix/winixd/core/dircontainer.h timezone.o: ../../../winix/winixd/core/winixbase.h +timezone.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +timezone.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +timezone.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +timezone.o: ../../../morm/src/flatconnector.h +timezone.o: ../../../morm/src/dbexpression.h +timezone.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +timezone.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +timezone.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +timezone.o: ../../../morm/src/fieldvaluehelper.h +timezone.o: ../../../morm/src/flatexpression.h +timezone.o: ../../../winix/winixd/models/itemcontent.h timezone.o: ../../../winix/winixd/core/ugcontainer.h timezone.o: ../../../winix/winixd/core/request.h timezone.o: ../../../winix/winixd/core/error.h @@ -4835,17 +4938,8 @@ timezone.o: ../../../winix/winixd/core/winixmodel.h timezone.o: ../../../winix/winixd/core/plugin.h timezone.o: ../../../winix/winixd/core/pluginmsg.h timezone.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -timezone.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -timezone.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -timezone.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -timezone.o: ../../../morm/src/flatconnector.h -timezone.o: ../../../morm/src/dbexpression.h -timezone.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -timezone.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -timezone.o: ../../../morm/src/finderhelper.h -timezone.o: ../../../morm/src/fieldvaluehelper.h -timezone.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -timezone.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +timezone.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +timezone.o: ../../../morm/src/jsonexpression.h timezone.o: ../../../morm/src/postgresqlexpression.h timezone.o: ../../../morm/src/jsonconnector.h timezone.o: ../../../morm/src/postgresqlconnector.h @@ -4875,8 +4969,9 @@ timezone.o: ../../../pikotools/convert/patternreplacer.h timezone.o: ../../../winix/winixd/templates/patterns.h locale.h timezone.o: ../../../winix/winixd/templates/localefilter.h timezone.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -timezone.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -timezone.o: functionparser.h ../../../winix/winixd/core/cur.h +timezone.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +timezone.o: ../../../ezc/src/cache.h functions.h functionparser.h +timezone.o: ../../../winix/winixd/core/cur.h timezone.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h timezone.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h timezone.o: download.h emacs.h env.h imgcrop.h last.h login.h logout.h ln.h @@ -4900,19 +4995,18 @@ timezone.o: ../../../winix/winixd/core/basethread.h timezone.o: ../../../winix/winixd/notify/templatesnotify.h timezone.o: ../../../winix/winixd/core/users.h timezone.o: ../../../winix/winixd/core/timezones.h -tinymce.o: tinymce.h functionbase.h ../../../winix/winixd/core/item.h -tinymce.o: ../../../pikotools/space/space.h -tinymce.o: ../../../pikotools/textstream/types.h -tinymce.o: ../../../pikotools/date/date.h -tinymce.o: ../../../pikotools/convert/inttostr.h -tinymce.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h +tinymce.o: tinymce.h functionbase.h ../../../winix/winixd/db/db.h +tinymce.o: ../../../winix/winixd/db/dbbase.h tinymce.o: ../../../winix/winixd/db/dbconn.h tinymce.o: ../../../winix/winixd/db/dbtextstream.h tinymce.o: ../../../winix/winixd/core/textstream.h tinymce.o: ../../../winix/winixd/core/misc.h -tinymce.o: ../../../winix/winixd/core/item.h tinymce.o: ../../../winix/winixd/core/requesttypes.h tinymce.o: ../../../pikotools/textstream/textstream.h +tinymce.o: ../../../pikotools/space/space.h +tinymce.o: ../../../pikotools/textstream/types.h +tinymce.o: ../../../pikotools/date/date.h +tinymce.o: ../../../pikotools/convert/inttostr.h tinymce.o: ../../../pikotools/membuffer/membuffer.h tinymce.o: ../../../pikotools/textstream/types.h tinymce.o: ../../../pikotools/utf8/utf8.h @@ -4940,6 +5034,16 @@ tinymce.o: ../../../winix/winixd/core/user.h tinymce.o: ../../../winix/winixd/core/group.h tinymce.o: ../../../winix/winixd/core/dircontainer.h tinymce.o: ../../../winix/winixd/core/winixbase.h +tinymce.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +tinymce.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +tinymce.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +tinymce.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +tinymce.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +tinymce.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +tinymce.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +tinymce.o: ../../../morm/src/fieldvaluehelper.h +tinymce.o: ../../../morm/src/flatexpression.h +tinymce.o: ../../../winix/winixd/models/itemcontent.h tinymce.o: ../../../winix/winixd/core/ugcontainer.h tinymce.o: ../../../winix/winixd/core/request.h tinymce.o: ../../../winix/winixd/core/error.h @@ -4954,16 +5058,8 @@ tinymce.o: ../../../winix/winixd/core/winixmodel.h tinymce.o: ../../../winix/winixd/core/plugin.h tinymce.o: ../../../winix/winixd/core/pluginmsg.h tinymce.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -tinymce.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -tinymce.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -tinymce.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -tinymce.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -tinymce.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -tinymce.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -tinymce.o: ../../../morm/src/finderhelper.h -tinymce.o: ../../../morm/src/fieldvaluehelper.h -tinymce.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -tinymce.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +tinymce.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +tinymce.o: ../../../morm/src/jsonexpression.h tinymce.o: ../../../morm/src/postgresqlexpression.h tinymce.o: ../../../morm/src/jsonconnector.h tinymce.o: ../../../morm/src/postgresqlconnector.h @@ -4993,8 +5089,9 @@ tinymce.o: ../../../pikotools/convert/patternreplacer.h tinymce.o: ../../../winix/winixd/templates/patterns.h locale.h tinymce.o: ../../../winix/winixd/templates/localefilter.h tinymce.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -tinymce.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -tinymce.o: functionparser.h ../../../winix/winixd/core/cur.h +tinymce.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +tinymce.o: ../../../ezc/src/cache.h functions.h functionparser.h +tinymce.o: ../../../winix/winixd/core/cur.h tinymce.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h tinymce.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h tinymce.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -5018,16 +5115,16 @@ tinymce.o: ../../../winix/winixd/core/basethread.h tinymce.o: ../../../winix/winixd/notify/templatesnotify.h tinymce.o: ../../../winix/winixd/core/users.h tinymce.o: ../../../winix/winixd/core/timezones.h -uname.o: uname.h functionbase.h ../../../winix/winixd/core/item.h -uname.o: ../../../pikotools/space/space.h -uname.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h -uname.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +uname.o: uname.h functionbase.h ../../../winix/winixd/db/db.h uname.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h uname.o: ../../../winix/winixd/db/dbtextstream.h uname.o: ../../../winix/winixd/core/textstream.h -uname.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +uname.o: ../../../winix/winixd/core/misc.h uname.o: ../../../winix/winixd/core/requesttypes.h uname.o: ../../../pikotools/textstream/textstream.h +uname.o: ../../../pikotools/space/space.h +uname.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +uname.o: ../../../pikotools/convert/inttostr.h uname.o: ../../../pikotools/membuffer/membuffer.h uname.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h uname.o: ../../../winix/winixd/core/winix_const.h @@ -5053,6 +5150,16 @@ uname.o: ../../../winix/winixd/db/dbitemcolumns.h uname.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h uname.o: ../../../winix/winixd/core/dircontainer.h uname.o: ../../../winix/winixd/core/winixbase.h +uname.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +uname.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +uname.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +uname.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +uname.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +uname.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +uname.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +uname.o: ../../../morm/src/fieldvaluehelper.h +uname.o: ../../../morm/src/flatexpression.h +uname.o: ../../../winix/winixd/models/itemcontent.h uname.o: ../../../winix/winixd/core/ugcontainer.h uname.o: ../../../winix/winixd/core/request.h uname.o: ../../../winix/winixd/core/error.h @@ -5066,16 +5173,8 @@ uname.o: ../../../winix/winixd/core/winixmodel.h uname.o: ../../../winix/winixd/core/plugin.h uname.o: ../../../winix/winixd/core/pluginmsg.h uname.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -uname.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -uname.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -uname.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -uname.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -uname.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -uname.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -uname.o: ../../../morm/src/finderhelper.h -uname.o: ../../../morm/src/fieldvaluehelper.h -uname.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -uname.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +uname.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +uname.o: ../../../morm/src/jsonexpression.h uname.o: ../../../morm/src/postgresqlexpression.h uname.o: ../../../morm/src/jsonconnector.h uname.o: ../../../morm/src/postgresqlconnector.h @@ -5104,8 +5203,9 @@ uname.o: ../../../pikotools/convert/patternreplacer.h uname.o: ../../../winix/winixd/templates/patterns.h locale.h uname.o: ../../../winix/winixd/templates/localefilter.h uname.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -uname.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -uname.o: functionparser.h ../../../winix/winixd/core/cur.h +uname.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +uname.o: ../../../ezc/src/cache.h functions.h functionparser.h +uname.o: ../../../winix/winixd/core/cur.h uname.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h uname.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h uname.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -5129,17 +5229,17 @@ uname.o: ../../../winix/winixd/core/basethread.h uname.o: ../../../winix/winixd/notify/templatesnotify.h uname.o: ../../../winix/winixd/core/users.h uname.o: ../../../winix/winixd/core/timezones.h -upload.o: upload.h functionbase.h ../../../winix/winixd/core/item.h -upload.o: ../../../pikotools/space/space.h -upload.o: ../../../pikotools/textstream/types.h -upload.o: ../../../pikotools/date/date.h -upload.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +upload.o: upload.h functionbase.h ../../../winix/winixd/db/db.h upload.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h upload.o: ../../../winix/winixd/db/dbtextstream.h upload.o: ../../../winix/winixd/core/textstream.h -upload.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +upload.o: ../../../winix/winixd/core/misc.h upload.o: ../../../winix/winixd/core/requesttypes.h upload.o: ../../../pikotools/textstream/textstream.h +upload.o: ../../../pikotools/space/space.h +upload.o: ../../../pikotools/textstream/types.h +upload.o: ../../../pikotools/date/date.h +upload.o: ../../../pikotools/convert/inttostr.h upload.o: ../../../pikotools/membuffer/membuffer.h upload.o: ../../../pikotools/textstream/types.h upload.o: ../../../pikotools/utf8/utf8.h @@ -5167,6 +5267,16 @@ upload.o: ../../../winix/winixd/core/user.h upload.o: ../../../winix/winixd/core/group.h upload.o: ../../../winix/winixd/core/dircontainer.h upload.o: ../../../winix/winixd/core/winixbase.h +upload.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +upload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +upload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +upload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +upload.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +upload.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +upload.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +upload.o: ../../../morm/src/fieldvaluehelper.h +upload.o: ../../../morm/src/flatexpression.h +upload.o: ../../../winix/winixd/models/itemcontent.h upload.o: ../../../winix/winixd/core/ugcontainer.h upload.o: ../../../winix/winixd/core/request.h upload.o: ../../../winix/winixd/core/error.h @@ -5181,16 +5291,8 @@ upload.o: ../../../winix/winixd/core/winixmodel.h upload.o: ../../../winix/winixd/core/plugin.h upload.o: ../../../winix/winixd/core/pluginmsg.h upload.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -upload.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -upload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -upload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -upload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -upload.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -upload.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -upload.o: ../../../morm/src/finderhelper.h -upload.o: ../../../morm/src/fieldvaluehelper.h -upload.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -upload.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +upload.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +upload.o: ../../../morm/src/jsonexpression.h upload.o: ../../../morm/src/postgresqlexpression.h upload.o: ../../../morm/src/jsonconnector.h upload.o: ../../../morm/src/postgresqlconnector.h @@ -5220,8 +5322,9 @@ upload.o: ../../../pikotools/convert/patternreplacer.h upload.o: ../../../winix/winixd/templates/patterns.h locale.h upload.o: ../../../winix/winixd/templates/localefilter.h upload.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -upload.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -upload.o: functionparser.h ../../../winix/winixd/core/cur.h +upload.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +upload.o: ../../../ezc/src/cache.h functions.h functionparser.h +upload.o: ../../../winix/winixd/core/cur.h upload.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h upload.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h upload.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -5253,17 +5356,17 @@ upload.o: ../../../winix/winixd/templates/indexpatterns.h upload.o: ../../../winix/winixd/templates/patterns.h upload.o: ../../../winix/winixd/templates/changepatterns.h upload.o: ../../../winix/winixd/templates/htmltextstream.h -uptime.o: uptime.h functionbase.h ../../../winix/winixd/core/item.h -uptime.o: ../../../pikotools/space/space.h -uptime.o: ../../../pikotools/textstream/types.h -uptime.o: ../../../pikotools/date/date.h -uptime.o: ../../../pikotools/convert/inttostr.h ../../../winix/winixd/db/db.h +uptime.o: uptime.h functionbase.h ../../../winix/winixd/db/db.h uptime.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h uptime.o: ../../../winix/winixd/db/dbtextstream.h uptime.o: ../../../winix/winixd/core/textstream.h -uptime.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +uptime.o: ../../../winix/winixd/core/misc.h uptime.o: ../../../winix/winixd/core/requesttypes.h uptime.o: ../../../pikotools/textstream/textstream.h +uptime.o: ../../../pikotools/space/space.h +uptime.o: ../../../pikotools/textstream/types.h +uptime.o: ../../../pikotools/date/date.h +uptime.o: ../../../pikotools/convert/inttostr.h uptime.o: ../../../pikotools/membuffer/membuffer.h uptime.o: ../../../pikotools/textstream/types.h uptime.o: ../../../pikotools/utf8/utf8.h @@ -5291,6 +5394,16 @@ uptime.o: ../../../winix/winixd/core/user.h uptime.o: ../../../winix/winixd/core/group.h uptime.o: ../../../winix/winixd/core/dircontainer.h uptime.o: ../../../winix/winixd/core/winixbase.h +uptime.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +uptime.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +uptime.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +uptime.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +uptime.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +uptime.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +uptime.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +uptime.o: ../../../morm/src/fieldvaluehelper.h +uptime.o: ../../../morm/src/flatexpression.h +uptime.o: ../../../winix/winixd/models/itemcontent.h uptime.o: ../../../winix/winixd/core/ugcontainer.h uptime.o: ../../../winix/winixd/core/request.h uptime.o: ../../../winix/winixd/core/error.h @@ -5305,16 +5418,8 @@ uptime.o: ../../../winix/winixd/core/winixmodel.h uptime.o: ../../../winix/winixd/core/plugin.h uptime.o: ../../../winix/winixd/core/pluginmsg.h uptime.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -uptime.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -uptime.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -uptime.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -uptime.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -uptime.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -uptime.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -uptime.o: ../../../morm/src/finderhelper.h -uptime.o: ../../../morm/src/fieldvaluehelper.h -uptime.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -uptime.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +uptime.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +uptime.o: ../../../morm/src/jsonexpression.h uptime.o: ../../../morm/src/postgresqlexpression.h uptime.o: ../../../morm/src/jsonconnector.h uptime.o: ../../../morm/src/postgresqlconnector.h @@ -5344,8 +5449,9 @@ uptime.o: ../../../pikotools/convert/patternreplacer.h uptime.o: ../../../winix/winixd/templates/patterns.h locale.h uptime.o: ../../../winix/winixd/templates/localefilter.h uptime.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -uptime.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.h -uptime.o: functionparser.h ../../../winix/winixd/core/cur.h +uptime.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h +uptime.o: ../../../ezc/src/cache.h functions.h functionparser.h +uptime.o: ../../../winix/winixd/core/cur.h uptime.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h uptime.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h uptime.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h @@ -5369,16 +5475,15 @@ uptime.o: ../../../winix/winixd/core/basethread.h uptime.o: ../../../winix/winixd/notify/templatesnotify.h uptime.o: ../../../winix/winixd/core/users.h uptime.o: ../../../winix/winixd/core/timezones.h -vim.o: vim.h functionbase.h ../../../winix/winixd/core/item.h -vim.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -vim.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -vim.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -vim.o: ../../../winix/winixd/db/dbconn.h +vim.o: vim.h functionbase.h ../../../winix/winixd/db/db.h +vim.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h vim.o: ../../../winix/winixd/db/dbtextstream.h vim.o: ../../../winix/winixd/core/textstream.h -vim.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +vim.o: ../../../winix/winixd/core/misc.h vim.o: ../../../winix/winixd/core/requesttypes.h vim.o: ../../../pikotools/textstream/textstream.h +vim.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +vim.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h vim.o: ../../../pikotools/membuffer/membuffer.h vim.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h vim.o: ../../../winix/winixd/core/winix_const.h @@ -5402,6 +5507,16 @@ vim.o: ../../../winix/winixd/db/dbitemcolumns.h vim.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h vim.o: ../../../winix/winixd/core/dircontainer.h vim.o: ../../../winix/winixd/core/winixbase.h +vim.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +vim.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +vim.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +vim.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +vim.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +vim.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +vim.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +vim.o: ../../../morm/src/fieldvaluehelper.h +vim.o: ../../../morm/src/flatexpression.h +vim.o: ../../../winix/winixd/models/itemcontent.h vim.o: ../../../winix/winixd/core/ugcontainer.h vim.o: ../../../winix/winixd/core/request.h vim.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h @@ -5414,15 +5529,8 @@ vim.o: ../../../winix/winixd/core/winixmodel.h vim.o: ../../../winix/winixd/core/plugin.h vim.o: ../../../winix/winixd/core/pluginmsg.h vim.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -vim.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -vim.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -vim.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -vim.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -vim.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -vim.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -vim.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -vim.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -vim.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +vim.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +vim.o: ../../../morm/src/jsonexpression.h vim.o: ../../../morm/src/postgresqlexpression.h vim.o: ../../../morm/src/jsonconnector.h vim.o: ../../../morm/src/postgresqlconnector.h @@ -5449,8 +5557,8 @@ vim.o: ../../../pikotools/convert/patternreplacer.h vim.o: ../../../winix/winixd/templates/patterns.h locale.h vim.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h vim.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -vim.o: ../../../ezc/src/cache.h functions.h functionparser.h -vim.o: ../../../winix/winixd/core/cur.h +vim.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +vim.o: functionparser.h ../../../winix/winixd/core/cur.h vim.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h vim.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h vim.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -5474,16 +5582,15 @@ vim.o: ../../../winix/winixd/core/basethread.h vim.o: ../../../winix/winixd/notify/templatesnotify.h vim.o: ../../../winix/winixd/core/users.h vim.o: ../../../winix/winixd/core/timezones.h -who.o: who.h functionbase.h ../../../winix/winixd/core/item.h -who.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h -who.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h -who.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h -who.o: ../../../winix/winixd/db/dbconn.h +who.o: who.h functionbase.h ../../../winix/winixd/db/db.h +who.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h who.o: ../../../winix/winixd/db/dbtextstream.h who.o: ../../../winix/winixd/core/textstream.h -who.o: ../../../winix/winixd/core/misc.h ../../../winix/winixd/core/item.h +who.o: ../../../winix/winixd/core/misc.h who.o: ../../../winix/winixd/core/requesttypes.h who.o: ../../../pikotools/textstream/textstream.h +who.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +who.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h who.o: ../../../pikotools/membuffer/membuffer.h who.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h who.o: ../../../winix/winixd/core/winix_const.h @@ -5507,6 +5614,16 @@ who.o: ../../../winix/winixd/db/dbitemcolumns.h who.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h who.o: ../../../winix/winixd/core/dircontainer.h who.o: ../../../winix/winixd/core/winixbase.h +who.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +who.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +who.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +who.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +who.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +who.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +who.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +who.o: ../../../morm/src/fieldvaluehelper.h +who.o: ../../../morm/src/flatexpression.h +who.o: ../../../winix/winixd/models/itemcontent.h who.o: ../../../winix/winixd/core/ugcontainer.h who.o: ../../../winix/winixd/core/request.h who.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h @@ -5519,15 +5636,8 @@ who.o: ../../../winix/winixd/core/winixmodel.h who.o: ../../../winix/winixd/core/plugin.h who.o: ../../../winix/winixd/core/pluginmsg.h who.o: ../../../winix/winixd/core/plugindata.h ../../../morm/src/morm.h -who.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -who.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -who.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -who.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -who.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -who.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -who.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -who.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -who.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +who.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +who.o: ../../../morm/src/jsonexpression.h who.o: ../../../morm/src/postgresqlexpression.h who.o: ../../../morm/src/jsonconnector.h who.o: ../../../morm/src/postgresqlconnector.h @@ -5554,8 +5664,8 @@ who.o: ../../../pikotools/convert/patternreplacer.h who.o: ../../../winix/winixd/templates/patterns.h locale.h who.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h who.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -who.o: ../../../ezc/src/cache.h functions.h functionparser.h -who.o: ../../../winix/winixd/core/cur.h +who.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h functions.h +who.o: functionparser.h ../../../winix/winixd/core/cur.h who.o: ../../../winix/winixd/core/winixmodel.h account.h adduser.h cat.h who.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h who.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h diff --git a/winixd/functions/cp.cpp b/winixd/functions/cp.cpp index 8d3a68a..975480e 100644 --- a/winixd/functions/cp.cpp +++ b/winixd/functions/cp.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -135,15 +135,15 @@ bool Cp::CopyStaticFile(const std::wstring & from, const std::wstring & to) void Cp::CopyStaticFile(Item & item) { -bool res1, res2, res3, res4, res5; +bool ok = true; - res1 = system->MakeFilePath(item, old_path, false); - res2 = !item.has_thumb || system->MakeFilePath(item, old_path_thumb, true); - res3 = system->CreateNewFile(item); - res4 = system->MakeFilePath(item, new_path, false, true, config->upload_dirs_chmod); - res5 = !item.has_thumb || system->MakeFilePath(item, new_path_thumb, true, true, config->upload_dirs_chmod); + ok = ok && system->MakeFilePath(item, old_path, false); + ok = ok && (!item.item_content.file_has_thumb || system->MakeFilePath(item, old_path_thumb, true)); + ok = ok && system->CreateNewFile(item); + ok = ok && system->MakeFilePath(item, new_path, false, true, config->upload_dirs_chmod); + ok = ok && (!item.item_content.file_has_thumb || system->MakeFilePath(item, new_path_thumb, true, true, config->upload_dirs_chmod)); - if( !res1 || !res2 || !res3 || !res4 || !res5 ) + if( !ok ) { cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; @@ -151,9 +151,14 @@ bool res1, res2, res3, res4, res5; if( CopyStaticFile(old_path, new_path) ) { - cur->request->status = db->EditFileById(item, item.id); + //cur->request->status = db->EditFileById(item, item.id); + if( !item.update(false, true) ) + { + cur->request->status = WINIX_ERR_PERMISSION_DENIED; + } - if( item.has_thumb ) + + if( item.item_content.file_has_thumb ) CopyStaticFile(old_path_thumb, new_path_thumb); } } @@ -162,9 +167,9 @@ bool res1, res2, res3, res4, res5; void Cp::SetNewAttributes(Item & item) { - item.user_id = new_user; - item.group_id = new_group; - item.SetDateModifyToNow(); + item.item_content.user_id = new_user; + item.item_content.group_id = new_group; + item.item_content.SetDateModifyToNow(); } @@ -174,11 +179,12 @@ void Cp::CopyFile(Item & item, long dst_dir_id) SetNewAttributes(item); item.parent_id = dst_dir_id; - cur->request->status = db->AddItem(item); - if( cur->request->status == WINIX_ERR_OK ) +// cur->request->status = db->AddItem(item); +// if( cur->request->status == WINIX_ERR_OK ) + if( item.insert() ) { - if( item.file_type != WINIX_ITEM_FILETYPE_NONE ) + if( item.item_content.file_type != WINIX_ITEM_FILETYPE_NONE ) CopyStaticFile(item); plugin->Call(WINIX_FILE_COPIED, &item); @@ -195,7 +201,7 @@ void Cp::CopyFileOrSymlink(Item & item, long dst_dir_id) { if( system->dirs.CreateDirTab(item.parent_id, symlink_dir_tab) ) { - int res = system->FollowAllLinks(symlink_dir_tab, item.link_to, symlink_dir_tab, item); + int res = system->FollowAllLinks(symlink_dir_tab, item.item_content.link_to, symlink_dir_tab, item); if( res == 0 ) CopyDirTree(*symlink_dir_tab.back(), dst_dir_id); @@ -215,11 +221,11 @@ void Cp::CopyFileOrSymlink(Item & item, long dst_dir_id) void Cp::Prepare() { - iq.SetAll(true, false); - iq.WhereType(Item::dir, false); +// iq.SetAll(true, false); +// iq.WhereType(Item::dir, false); new_user = -1; - new_group = dir_tab.back()->group_id; + new_group = dir_tab.back()->item_content.group_id; if( cur->session->puser ) new_user = cur->session->puser->id; @@ -232,8 +238,17 @@ void Cp::Prepare() void Cp::CopyFilesInDir(const Item & dir, long dst_dir_id) { - iq.WhereParentId(dir.id); - db->GetItems(item_tab, iq); + morm::Finder finder(model_connector); + + item_tab = finder. + select(). + where(). + neq(L"type", static_cast(Item::dir)). + eq(L"parent_id", dir.id). + get_vector(); + + //iq.WhereParentId(dir.id); + //db->GetItems(item_tab, iq); for(size_t i=0 ; irequest->status = system->dirs.AddDirectory(temp); diff --git a/winixd/functions/cp.h b/winixd/functions/cp.h index d6dcce4..d8488b4 100644 --- a/winixd/functions/cp.h +++ b/winixd/functions/cp.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,7 +57,6 @@ public: private: Item temp; - DbItemQuery iq; bool remove_defaults; bool preserve_attr; bool follow_symlinks; diff --git a/winixd/functions/default.cpp b/winixd/functions/default.cpp index 0aebc45..450936d 100644 --- a/winixd/functions/default.cpp +++ b/winixd/functions/default.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,17 +59,16 @@ void Default::MakePost() { Item & dir = *cur->request->dir_tab.back(); - dir.link_to = cur->request->PostVar(L"linkto"); - dir.link_redirect = cur->request->IsPostVar(L"makeredirect") ? 1 : 0; - TrimWhite(dir.link_to); + dir.item_content.link_to = cur->request->PostVar(L"linkto"); + dir.item_content.link_redirect = cur->request->IsPostVar(L"makeredirect") ? 1 : 0; + TrimWhite(dir.item_content.link_to); - // !! dodac sprawdzenie czy link_to jest pusty teraz + // !! IMPROVEME dodac sprawdzenie czy link_to jest pusty teraz - cur->request->status = db->EditLinkItem(dir.id, dir.link_to, dir.link_redirect); - - if( cur->request->status == WINIX_ERR_OK ) + //cur->request->status = db->EditLinkItem(dir.id, dir.link_to, dir.link_redirect); + if( dir.update(false, true) ) { - log << log2 << "Default: changed link_to: " << dir.link_to << ", for dir_id: " << dir.id << logend; + log << log2 << "Default: changed link_to: " << dir.item_content.link_to << ", for dir_id: " << dir.id << logend; system->RedirectToLastDir(); } } diff --git a/winixd/functions/download.cpp b/winixd/functions/download.cpp index 735ac65..c26014d 100644 --- a/winixd/functions/download.cpp +++ b/winixd/functions/download.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,8 +63,8 @@ void Download::MakeGet() if( !system->HasReadAccess(cur->request->item) || - cur->request->item.file_type == WINIX_ITEM_FILETYPE_NONE || - cur->request->item.file_path.empty() ) + cur->request->item.item_content.file_type == WINIX_ITEM_FILETYPE_NONE || + cur->request->item.item_content.file_path.empty() ) { cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; @@ -72,7 +72,7 @@ void Download::MakeGet() cur->request->send_as_attachment = cur->request->IsParam(L"attachment"); - if( cur->request->item.has_thumb && cur->request->IsParam(L"thumb") ) + if( cur->request->item.item_content.file_has_thumb && cur->request->IsParam(L"thumb") ) system->MakeFilePath(cur->request->item, cur->request->x_sendfile, true); else system->MakeFilePath(cur->request->item, cur->request->x_sendfile); diff --git a/winixd/functions/emacs.cpp b/winixd/functions/emacs.cpp index bf12cb5..c5c28bb 100644 --- a/winixd/functions/emacs.cpp +++ b/winixd/functions/emacs.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -149,7 +149,7 @@ void Emacs::MakePost() { cur->request->is_item = true; // !! moze lepiej nie ustawiac is_item? (bo jak wystapi blad np dodania do bazy danych // to formularz edycji zmieni sie z 'dodaj' na 'edytuj' - cur->request->item.privileges = system->NewFilePrivileges(); + cur->request->item.item_content.privileges = system->NewFilePrivileges(); cur->request->status = system->AddFile(cur->request->item, NotifyCodeAdd()); } else diff --git a/winixd/functions/functionbase.cpp b/winixd/functions/functionbase.cpp index d18ff95..b4e3ad1 100644 --- a/winixd/functions/functionbase.cpp +++ b/winixd/functions/functionbase.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -47,9 +47,9 @@ FunctionBase::FunctionBase() need_ssl = false; need_session = true; - fun.user_id = -1; - fun.group_id = -1; - fun.privileges = 07555; + fun.item_content.user_id = -1; + fun.item_content.group_id = -1; + fun.item_content.privileges = 07555; fun.parent_id = -1; fun.id = -1; fun.type = Item::file; diff --git a/winixd/functions/functionbase.h b/winixd/functions/functionbase.h index 58446e6..53662a6 100644 --- a/winixd/functions/functionbase.h +++ b/winixd/functions/functionbase.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,7 +37,6 @@ #include #include -#include "core/item.h" #include "db/db.h" #include "core/request.h" #include "core/config.h" @@ -45,6 +44,7 @@ #include "core/synchro.h" #include "notify/notify.h" #include "core/winixrequest.h" +#include "models/item.h" diff --git a/winixd/functions/functionparser.cpp b/winixd/functions/functionparser.cpp index 999451b..2ba3c0e 100644 --- a/winixd/functions/functionparser.cpp +++ b/winixd/functions/functionparser.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,10 +34,10 @@ #include "functionparser.h" #include "core/log.h" -#include "core/item.h" #include "core/error.h" #include "functions.h" #include "utf8/utf8.h" +#include "models/item.h" @@ -141,17 +141,26 @@ bool FunctionParser::CheckAddItem() { // cur->request->dir_tab has at least one element long parent_id = cur->request->dir_tab.back()->id; - Error status = db->GetItem(parent_id, name, cur->request->item); - if( status == WINIX_ERR_OK ) + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", parent_id). + eq(L"url", name). + get(cur->request->item); + + //Error status = db->GetItem(parent_id, name, cur->request->item); + //if( status == WINIX_ERR_OK ) + if( cur->request->item.found() ) { log << log3 << "FP: Item: id: " << cur->request->item.id << ", url: " << cur->request->item.url << logend; cur->request->last_item = &cur->request->item; cur->request->is_item = true; return true; } - - if( status == WINIX_ERR_NO_ITEM ) + else { log << log3 << "FP: No Item: url: " << name << logend; cur->request->status = WINIX_ERR_NO_ITEM; diff --git a/winixd/functions/functions.cpp b/winixd/functions/functions.cpp index cb8d701..bd35fe2 100644 --- a/winixd/functions/functions.cpp +++ b/winixd/functions/functions.cpp @@ -169,7 +169,7 @@ Error Functions::CheckSpecialFile(const Item & item) log << log3 << "Functions: reloading mount points" << logend; cur->mount = system->mounts.GetEmptyMount(); - system->mounts.ReadMounts(item.content); + system->mounts.ReadMounts(item.item_content.content_raw); cur->mount = system->mounts.pmount; templates->ReadNewIndexTemplates(); templates->ReadNewChangeTemplates(); @@ -302,7 +302,7 @@ void Functions::Parse() void Functions::SetDefaultFunctionForFile() { - if( cur->request->item.file_type != WINIX_ITEM_FILETYPE_NONE ) + if( cur->request->item.item_content.file_type != WINIX_ITEM_FILETYPE_NONE ) cur->request->function = &fun_download; else if( system->HasReadExecAccess(cur->request->item) ) @@ -359,13 +359,13 @@ void Functions::CheckFunctionFollowDir(bool was_default_function) if( was_default_function ) { - if( cur->request->dir_tab.back()->link_redirect == 1 ) + if( cur->request->dir_tab.back()->item_content.link_redirect == 1 ) { - system->RedirectTo(cur->request->dir_tab.back()->link_to); + system->RedirectTo(cur->request->dir_tab.back()->item_content.link_to); } else { - if( system->FollowAllLinks(cur->request->dir_tab.back()->link_to, true, true) ) + if( system->FollowAllLinks(cur->request->dir_tab.back()->item_content.link_to, true, true) ) SetDefaultFunction(); } } @@ -375,15 +375,15 @@ void Functions::CheckFunctionFollowDir(bool was_default_function) void Functions::CheckFunctionFollowSymlink(bool was_default_function) { - if( cur->request->item.link_redirect == 1 ) + if( cur->request->item.item_content.link_redirect == 1 ) { if( was_default_function ) - system->RedirectTo(cur->request->item.link_to); + system->RedirectTo(cur->request->item.item_content.link_to); else - system->RedirectWithFunctionAndParamsTo(cur->request->item.link_to); + system->RedirectWithFunctionAndParamsTo(cur->request->item.item_content.link_to); } else - if( system->FollowAllLinks(cur->request->item.link_to, true, true) ) + if( system->FollowAllLinks(cur->request->item.item_content.link_to, true, true) ) { if( was_default_function ) SetDefaultFunction(); @@ -415,7 +415,7 @@ bool was_default_function = false; if( cur->request->status != WINIX_ERR_OK || !cur->request->redirect_to.empty() ) return; - if( !cur->request->is_item && !cur->request->dir_tab.back()->link_to.empty() ) + if( !cur->request->is_item && !cur->request->dir_tab.back()->item_content.link_to.empty() ) CheckFunctionFollowDir(was_default_function); else if( cur->request->is_item && cur->request->item.type == Item::symlink && cur->request->function && cur->request->function->follow_symlinks ) @@ -603,7 +603,7 @@ void Functions::ReadItemFilterHtml(Item & item) html_filter.ClearOrphans(); // SetNoFilterTag doesn't have to be called (default empty tag) - html_filter.Filter(cur->request->PostVar(L"itemcontent"), item.content); + html_filter.Filter(cur->request->PostVar(L"itemcontent"), item.item_content.content_raw); } @@ -618,13 +618,13 @@ void Functions::ReadItemContent(Item & item, const std::wstring & content_type) if( filter_html ) ReadItemFilterHtml(item); else - cur->request->PostVar(L"itemcontent", item.content); + cur->request->PostVar(L"itemcontent", item.item_content.content_raw); } void Functions::ReadItemContentWithType(Item & item) { - item.content_type = Item::ct_formatted_text; // default is formatted text + item.item_content.content_raw_type = ItemContent::ct_formatted_text; // default is formatted text cur->request->PostVar(L"contenttype", temp); ReadItemContent(item, temp); @@ -633,10 +633,10 @@ void Functions::ReadItemContentWithType(Item & item) // ct_text and ct_formatted_text can use everyone if( temp == L"0" ) - item.content_type = Item::ct_text; + item.item_content.content_raw_type = ItemContent::ct_text; else if( temp == L"1" ) - item.content_type = Item::ct_formatted_text; + item.item_content.content_raw_type = ItemContent::ct_formatted_text; // those below need special privileges @@ -649,19 +649,19 @@ void Functions::ReadItemContentWithType(Item & item) if( temp == L"2" ) { if( system->CanUseHtml(user_id) ) - item.content_type = Item::ct_html; + item.item_content.content_raw_type = ItemContent::ct_html; } else if( temp == L"3" ) { if( system->CanUseBBCode(user_id) ) - item.content_type = Item::ct_bbcode; + item.item_content.content_raw_type = ItemContent::ct_bbcode; } else if( temp == L"4" ) { if( system->CanUseOther(user_id) ) - item.content_type = Item::ct_other; + item.item_content.content_raw_type = ItemContent::ct_other; } } @@ -691,16 +691,16 @@ void Functions::SetUser(Item & item) { if( cur->session && cur->session->puser ) { - item.user_id = cur->session->puser->id; - item.guest_name.clear(); + item.item_content.user_id = cur->session->puser->id; + item.item_content.guest_name.clear(); } else { - item.user_id = -1; - cur->request->PostVar(L"guestname", item.guest_name); + item.item_content.user_id = -1; + cur->request->PostVar(L"guestname", item.item_content.guest_name); } - item.group_id = cur->request->dir_tab.back()->group_id; + item.item_content.group_id = cur->request->dir_tab.back()->item_content.group_id; } diff --git a/winixd/functions/imgcrop.cpp b/winixd/functions/imgcrop.cpp index b6c85b2..da6f75d 100644 --- a/winixd/functions/imgcrop.cpp +++ b/winixd/functions/imgcrop.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2013-2014, Tomasz Sowa + * Copyright (c) 2013-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,13 +63,23 @@ bool ImgCrop::HasAccess() void ImgCrop::GetDirContent() { - iq.sel_type = Item::file; - iq.sel_content = false; +// iq.sel_type = Item::file; +// iq.sel_content = false; +// +// iq.WhereParentId(cur->request->dir_tab.back()->id); +// iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); - iq.WhereParentId(cur->request->dir_tab.back()->id); - iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); + morm::Finder finder(model_connector); - db->GetItems(cur->request->item_tab, iq); + cur->request->item_tab = finder. + select(). + where(). + eq(L"type", static_cast(Item::file)). + eq(L"parent_id", cur->request->dir_tab.back()->id). + eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE). + get_vector(); + + //db->GetItems(cur->request->item_tab, iq); system->CheckWriteAccessToItems(cur->request->item_tab); } @@ -89,7 +99,7 @@ void ImgCrop::MakePost() Item & item = cur->request->item; - if( cur->request->is_item && item.type == Item::file && item.file_type == WINIX_ITEM_FILETYPE_IMAGE ) + if( cur->request->is_item && item.type == Item::file && item.item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE ) { if( system->HasWriteAccess(item) ) { diff --git a/winixd/functions/imgcrop.h b/winixd/functions/imgcrop.h index df76809..9eb2853 100644 --- a/winixd/functions/imgcrop.h +++ b/winixd/functions/imgcrop.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2013-2014, Tomasz Sowa + * Copyright (c) 2013-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,7 +57,7 @@ public: private: - DbItemQuery iq; + //DbItemQuery iq; void GetDirContent(); diff --git a/winixd/functions/ln.cpp b/winixd/functions/ln.cpp index b4f1e6a..cb90329 100644 --- a/winixd/functions/ln.cpp +++ b/winixd/functions/ln.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,17 +62,19 @@ bool Ln::HasAccess() bool Ln::CreateSymbolicLink(long parent_id, const wchar_t * link_to, const wchar_t * url, bool link_redirect) { + item.set_connector(model_connector); item.Clear(); // setting the date to now item.type = Item::symlink; item.parent_id = parent_id; item.url = url; - item.link_to = link_to; - item.link_redirect = static_cast(link_redirect); - item.privileges = system->NewFilePrivileges(); + item.item_content.link_to = link_to; + item.item_content.link_redirect = static_cast(link_redirect); + item.item_content.privileges = system->NewFilePrivileges(); functions->SetUser(item); functions->PrepareUrl(item); -return db->AddItem(item) == WINIX_ERR_OK; + return item.insert(); +//return db->AddItem(item) == WINIX_ERR_OK; } @@ -124,7 +126,11 @@ bool Ln::CreateHardLink(const std::vector & dirs, const std::wstring & li item.url = url; functions->PrepareUrl(item); - return db->AddHardLink(item) == WINIX_ERR_OK; + /* + * IMPROVEME + * + */ + //return db->AddHardLink(item) == WINIX_ERR_OK; } return false; diff --git a/winixd/functions/ls.cpp b/winixd/functions/ls.cpp index d50b5eb..5845b2a 100644 --- a/winixd/functions/ls.cpp +++ b/winixd/functions/ls.cpp @@ -61,22 +61,33 @@ void Ls::MakeGet() if( !cur->request->is_item ) { - DbItemQuery iq; +// DbItemQuery iq; +// +// iq.sel_content = false; +// +// iq.WhereParentId(cur->request->dir_tab.back()->id); +// iq.WhereType(Item::dir, false); - iq.sel_content = false; + morm::Finder finder(model_connector); - iq.WhereParentId(cur->request->dir_tab.back()->id); - iq.WhereType(Item::dir, false); + finder. + select(). + where(). + eq(L"parent_id", cur->request->dir_tab.back()->id). + neq(L"type", static_cast(Item::dir)); if( cur->request->IsParam(L"ckeditor_browse") ) { - iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); - db->GetItems(cur->request->item_tab, iq); - } - else - { - db->GetItems(cur->request->item_tab, iq); + //iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); + //db->GetItems(cur->request->item_tab, iq); + finder.eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE); } +// else +// { +// //db->GetItems(cur->request->item_tab, iq); +// } + + finder.get_vector(cur->request->item_tab); } } diff --git a/winixd/functions/meta.cpp b/winixd/functions/meta.cpp index 2ca7be4..937f79f 100644 --- a/winixd/functions/meta.cpp +++ b/winixd/functions/meta.cpp @@ -71,18 +71,21 @@ return (conf_parser.ParseString(meta_str) == PT::SpaceParser::ok); -bool Meta::EditAdminMeta(long item_id, const std::wstring & meta_str, bool use_ses_log) +bool Meta::EditAdminMeta(Item & item, const std::wstring & meta_str, bool use_ses_log) { if( Parse(meta_str) ) { - if( db->EditAdminMetaById(space, item_id) == WINIX_ERR_OK ) + item.item_content.meta_admin = space; + + //if( db->EditAdminMetaById(space, item_id) == WINIX_ERR_OK ) + if( item.update(false, true) ) { return true; } else { log << log1 << "Meta: a database problem with changing admin meta information for item id: " - << item_id << logend; + << item.id << logend; } } else @@ -98,18 +101,21 @@ return false; -bool Meta::EditMeta(long item_id, const std::wstring & meta_str, bool use_ses_log) +bool Meta::EditMeta(Item & item, const std::wstring & meta_str, bool use_ses_log) { if( Parse(meta_str) ) { - if( db->EditMetaById(space, item_id) == WINIX_ERR_OK ) + item.item_content.meta = space; + + //if( db->EditMetaById(space, item_id) == WINIX_ERR_OK ) + if( item.update(false, true) ) { return true; } else { log << log1 << "Meta: a database problem with changing meta information for item id: " - << item_id << logend; + << item.id << logend; } } else @@ -133,11 +139,8 @@ void Meta::ChangeAdminMeta() { const std::wstring & meta_str = cur->request->PostVar(L"itemmeta"); - if( EditAdminMeta(cur->request->last_item->id, meta_str, true) ) + if( EditAdminMeta(*cur->request->last_item, meta_str, true) ) { - if( cur->request->last_item->type == Item::dir ) - cur->request->last_item->ameta = space; - system->RedirectToLastItem(); } } @@ -150,11 +153,8 @@ void Meta::ChangeMeta() { const std::wstring & meta_str = cur->request->PostVar(L"itemmeta"); - if( EditMeta(cur->request->last_item->id, meta_str, true) ) + if( EditMeta(*cur->request->last_item, meta_str, true) ) { - if( cur->request->last_item->type == Item::dir ) - cur->request->last_item->meta = space; - system->RedirectToLastItem(); } } diff --git a/winixd/functions/meta.h b/winixd/functions/meta.h index c5cfcd9..67870fd 100644 --- a/winixd/functions/meta.h +++ b/winixd/functions/meta.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,8 +55,8 @@ public: bool HasAccess(); void MakePost(); - bool EditAdminMeta(long item_id, const std::wstring & meta_str, bool use_ses_log = false); - bool EditMeta(long item_id, const std::wstring & meta_str, bool use_ses_log = false); + bool EditAdminMeta(Item & item, const std::wstring & meta_str, bool use_ses_log = false); + bool EditMeta(Item & item, const std::wstring & meta_str, bool use_ses_log = false); private: diff --git a/winixd/functions/mkdir.cpp b/winixd/functions/mkdir.cpp index aa007f5..69bb905 100644 --- a/winixd/functions/mkdir.cpp +++ b/winixd/functions/mkdir.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -92,7 +92,7 @@ void Mkdir::PostFunMkdir(bool add_to_dir_tab, int privileges) { functions->ReadItem(cur->request->item, Item::dir); functions->SetUser(cur->request->item); - cur->request->item.privileges = privileges; + cur->request->item.item_content.privileges = privileges; Item * pdir; cur->request->status = system->dirs.AddDirectory(cur->request->item, add_to_dir_tab, &pdir); diff --git a/winixd/functions/mv.cpp b/winixd/functions/mv.cpp index 1ab030b..1273fed 100644 --- a/winixd/functions/mv.cpp +++ b/winixd/functions/mv.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,7 +62,7 @@ bool Mv::HasAccess() { if( cur->request->is_item ) { - if( !system->CanRemoveRenameChild(*cur->request->dir_tab.back(), cur->request->item.user_id) ) + if( !system->CanRemoveRenameChild(*cur->request->dir_tab.back(), cur->request->item.item_content.user_id) ) return false; } else @@ -102,7 +102,7 @@ bool Mv::CheckAccessFromToDir(const Item & dir, bool only_content) // ops, there is no a parent dir return false; - if( !system->CanRemoveRenameChild(*last_but_one_dir, dir.user_id) ) + if( !system->CanRemoveRenameChild(*last_but_one_dir, dir.item_content.user_id) ) return false; } @@ -115,26 +115,26 @@ return true; // !! IMPROVE ME: may a better name? void Mv::Prepare() { - content_dir_iq.SetAll(false, false); - content_dir_iq.sel_parent_id = true; - content_dir_iq.sel_type = true; - content_dir_iq.sel_url = true; - content_dir_iq.sel_file = true; - content_dir_iq.sel_user_id = true; - content_dir_iq.sel_group_id = true; - content_dir_iq.sel_privileges = true; - content_dir_iq.sel_meta = true; - - files_iq.SetAll(false, false); - files_iq.sel_parent_id = true; - files_iq.sel_type = true; - files_iq.sel_url = true; - files_iq.sel_file = true; - files_iq.sel_user_id = true; - files_iq.sel_group_id = true; - files_iq.sel_privileges = true; - files_iq.sel_meta = true; - files_iq.WhereType(Item::dir, false); +// content_dir_iq.SetAll(false, false); +// content_dir_iq.sel_parent_id = true; +// content_dir_iq.sel_type = true; +// content_dir_iq.sel_url = true; +// content_dir_iq.sel_file = true; +// content_dir_iq.sel_user_id = true; +// content_dir_iq.sel_group_id = true; +// content_dir_iq.sel_privileges = true; +// content_dir_iq.sel_meta = true; +// +// files_iq.SetAll(false, false); +// files_iq.sel_parent_id = true; +// files_iq.sel_type = true; +// files_iq.sel_url = true; +// files_iq.sel_file = true; +// files_iq.sel_user_id = true; +// files_iq.sel_group_id = true; +// files_iq.sel_privileges = true; +// files_iq.sel_meta = true; +// files_iq.WhereType(Item::dir, false); } @@ -169,7 +169,17 @@ bool Mv::ParseDirCheckLastName() } else { - if( db->GetItem(out_dir_tab.back()->id, out_filename, out_item) == WINIX_ERR_OK ) + morm::Finder finder(model_connector); + + out_item = finder. + select(). + where(). + eq(L"parent_id", out_dir_tab.back()->id). + eq(L"url", out_filename). + get(); + + //if( db->GetItem(out_dir_tab.back()->id, out_filename, out_item) == WINIX_ERR_OK ) + if( out_item.found() ) { out_has_file = true; out_filename.clear(); @@ -219,7 +229,7 @@ bool Mv::CanRemoveRenameChild(const Item & child) { Item * parent_dir = system->dirs.GetDir(child.parent_id); - if( !parent_dir || !system->CanRemoveRenameChild(*parent_dir, child.user_id) ) + if( !parent_dir || !system->CanRemoveRenameChild(*parent_dir, child.item_content.user_id) ) { log << log1 << "Mv: permission denied to: " << child.url << logend; slog << logerror << T("mv_permission_denied_to") << ": " << child.url << logend; @@ -255,15 +265,16 @@ bool Mv::MoveStaticFile(const std::wstring & from, const std::wstring & to) void Mv::MoveStaticFile(Item & item) { -bool res1, res2, res3, res4, res5; +bool ok = true; +//bool res1, res2, res3, res4, res5; - res1 = system->MakeFilePath(item, old_static_path, false); - res2 = !item.has_thumb || system->MakeFilePath(item, old_static_thumb_path, true); - res3 = system->CreateNewFile(item); - res4 = system->MakeFilePath(item, new_static_path, false, true, config->upload_dirs_chmod); - res5 = !item.has_thumb || system->MakeFilePath(item, new_static_thumb_path, true, true, config->upload_dirs_chmod); + ok = ok && system->MakeFilePath(item, old_static_path, false); + ok = ok && (!item.item_content.file_has_thumb || system->MakeFilePath(item, old_static_thumb_path, true)); + ok = ok && system->CreateNewFile(item); + ok = ok && system->MakeFilePath(item, new_static_path, false, true, config->upload_dirs_chmod); + ok = ok && (!item.item_content.file_has_thumb || system->MakeFilePath(item, new_static_thumb_path, true, true, config->upload_dirs_chmod)); - if( !res1 || !res2 || !res3 || !res4 || !res5 ) + if( !ok ) { log << log1 << "Mv: cannot create a static path" << logend; slog << logerror << T("internal_error") << logend; @@ -272,14 +283,15 @@ bool res1, res2, res3, res4, res5; if( MoveStaticFile(old_static_path, new_static_path) ) { - if( db->EditFileById(item, item.id) != WINIX_ERR_OK ) + //if( db->EditFileById(item, item.id) != WINIX_ERR_OK ) + if( !item.update(false, true) ) { log << log1 << "Mv: cannot move static file (database problem)" << logend; slog << logerror << T("internal_error") << logend; return; } - if( item.has_thumb ) + if( item.item_content.file_has_thumb ) MoveStaticFile(old_static_thumb_path, new_static_thumb_path); } } @@ -294,8 +306,17 @@ void Mv::MoveFilesPrepareTreeGo(const Item & src_dir) for( ; i != system->dirs.ParentEnd() ; i = system->dirs.NextChild(i) ) MoveFilesPrepareTreeGo(*(i->second)); - files_iq.WhereParentId(src_dir.id); - db->GetItems(files_item_tab, files_iq); + //files_iq.WhereParentId(src_dir.id); + //db->GetItems(files_item_tab, files_iq); + + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", src_dir.id). + neq(L"type", static_cast(Item::dir)). + get_vector(files_item_tab); for(size_t i=0 ; iCall(WINIX_FILE_PREPARE_TO_MOVE, &files_item_tab[i]); @@ -324,12 +345,21 @@ void Mv::MoveFilesTree(const Item & dir) for( ; i != system->dirs.ParentEnd() ; i = system->dirs.NextChild(i) ) MoveFilesTree(*(i->second)); - files_iq.WhereParentId(dir.id); - db->GetItems(files_item_tab, files_iq); + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", dir.id). + neq(L"type", static_cast(Item::dir)). + get_vector(files_item_tab); + + //files_iq.WhereParentId(dir.id); + //db->GetItems(files_item_tab, files_iq); for(size_t i=0 ; iCall(WINIX_FILE_PREPARE_TO_MOVE, &files_item_tab[i]); MoveStaticFile(files_item_tab[i]); @@ -370,9 +400,8 @@ bool Mv::MoveDir(Item & src_dir, std::vector & dst_dir_tab, const std::ws functions->PrepareUrl(src_dir); } - Error status = db->EditParentUrlById(src_dir, src_dir.id); - - if( status == WINIX_ERR_OK ) + //Error status = db->EditParentUrlById(src_dir, src_dir.id); + if( src_dir.update(true, false) ) { log << log3 << "Mv: directory: " << old_url << " was moved to: "; system->dirs.LogDir(dst_dir_tab); @@ -499,9 +528,9 @@ bool Mv::MoveFileOrSymlink(Item & src_file, std::vector & dst_dir_tab, co } src_file.parent_id = dst_dir_tab.back()->id; - Error status = db->EditParentUrlById(src_file, src_file.id); - if( status == WINIX_ERR_OK ) + //Error status = db->EditParentUrlById(src_file, src_file.id); + if( src_file.update(true, false) ) { if( src_file.type == Item::file ) log << log3 << "Mv: file: "; @@ -512,7 +541,7 @@ bool Mv::MoveFileOrSymlink(Item & src_file, std::vector & dst_dir_tab, co system->dirs.LogDir(dst_dir_tab); log << src_file.url << logend; - if( src_file.file_type != WINIX_ITEM_FILETYPE_NONE ) + if( src_file.item_content.file_type != WINIX_ITEM_FILETYPE_NONE ) MoveStaticFile(src_file); plugin->Call(WINIX_FILE_MOVED, &src_file); @@ -604,13 +633,22 @@ bool Mv::MoveFileOrSymlink2(Item & src_file, const std::wstring & dst_path, bool // private void Mv::MoveAllFilesFromDir(Item & src_dir, std::vector & dst_dir_tab, bool check_access) { - content_dir_iq.WhereParentId(src_dir.id); - db->GetItems(item_tab, content_dir_iq); +// content_dir_iq.WhereParentId(src_dir.id); +// db->GetItems(item_tab, content_dir_iq); + + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", src_dir.id). + get_vector(item_tab); + out_filename.clear(); for(size_t i=0 ; iCanRemoveRenameChild(src_dir, item_tab[i].user_id) ) + if( check_access && !system->CanRemoveRenameChild(src_dir, item_tab[i].item_content.user_id) ) { log << log1 << "Mv: permission denied to: " << src_dir.url << logend; slog << logerror << T("mv_permission_denied_to") << ": " << src_dir.url << logend; diff --git a/winixd/functions/mv.h b/winixd/functions/mv.h index 49a585e..34edcf1 100644 --- a/winixd/functions/mv.h +++ b/winixd/functions/mv.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -95,10 +95,10 @@ private: // for files/symlinks in a directory std::vector files_item_tab; - DbItemQuery files_iq; + //DbItemQuery files_iq; // for moving content of a directory (all dirs/files/symlinks) - DbItemQuery content_dir_iq; + //DbItemQuery content_dir_iq; std::vector item_tab; diff --git a/winixd/functions/privchanger.cpp b/winixd/functions/privchanger.cpp index 2e60006..0bce5c9 100644 --- a/winixd/functions/privchanger.cpp +++ b/winixd/functions/privchanger.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -78,7 +78,7 @@ return true; bool PrivChanger::ChangeOwner(Item & item, long user_id, long group_id) { - if( user_id!=item.user_id || group_id!=item.group_id ) + if( user_id!=item.item_content.user_id || group_id!=item.item_content.group_id ) { if( !system->CanChangeUser(item, user_id) ) { @@ -93,8 +93,8 @@ bool PrivChanger::ChangeOwner(Item & item, long user_id, long group_id) } } - item.user_id = user_id; - item.group_id = group_id; + item.item_content.user_id = user_id; + item.item_content.group_id = group_id; return true; } @@ -103,7 +103,7 @@ return true; bool PrivChanger::ChangePrivileges(Item & item, int privileges) { - if( privileges != item.privileges ) + if( privileges != item.item_content.privileges ) { if( !system->CanChangePrivileges(item, privileges) ) { @@ -112,7 +112,7 @@ bool PrivChanger::ChangePrivileges(Item & item, int privileges) } } - item.privileges = privileges; + item.item_content.privileges = privileges; return true; } @@ -133,7 +133,11 @@ void PrivChanger::ChangePriv(Item & item, long user_id, long group_id, int privi return; } - cur->request->status = db->EditPrivById(item, item.id); + //cur->request->status = db->EditPrivById(item, item.id); + if( !item.update(false, true) ) + { + // IMPROVEME put some log here, and slog too + } } @@ -197,16 +201,24 @@ Item * root = 0; void PrivChanger::PrivFilesInDir(long parent_id) { - DbItemQuery iq; +// DbItemQuery iq; +// +// iq.SetAll(false, false); +// iq.sel_user_id = iq.sel_group_id = iq.sel_guest_name = iq.sel_privileges = iq.sel_url = true; +// +// iq.WhereParentId(parent_id); +// iq.WhereType(Item::dir, false); - iq.SetAll(false, false); - iq.sel_user_id = iq.sel_group_id = iq.sel_guest_name = iq.sel_privileges = iq.sel_url = true; + morm::Finder finder(model_connector); - iq.WhereParentId(parent_id); - iq.WhereType(Item::dir, false); - - db->GetItems(cur->request->item_tab, iq); + finder. + select(). + where(). + eq(L"parent_id", parent_id). + neq(L"type", static_cast(Item::dir)). + get_vector(cur->request->item_tab); + //db->GetItems(cur->request->item_tab, iq); std::vector::iterator i = cur->request->item_tab.begin(); diff --git a/winixd/functions/pw.cpp b/winixd/functions/pw.cpp index 0db4288..7239ef8 100644 --- a/winixd/functions/pw.cpp +++ b/winixd/functions/pw.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2012-2014, Tomasz Sowa + * Copyright (c) 2012-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,7 +48,7 @@ namespace Fun Pw::Pw() { fun.url = L"pw"; - fun.privileges = 07000; + fun.item_content.privileges = 07000; } diff --git a/winixd/functions/reload.cpp b/winixd/functions/reload.cpp index 8d5d875..4c6f1fa 100644 --- a/winixd/functions/reload.cpp +++ b/winixd/functions/reload.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ namespace Fun Reload::Reload() { fun.url = L"reload"; - fun.privileges = 07000; + fun.item_content.privileges = 07000; } diff --git a/winixd/functions/rm.cpp b/winixd/functions/rm.cpp index 5445356..9609ebc 100644 --- a/winixd/functions/rm.cpp +++ b/winixd/functions/rm.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -80,7 +80,7 @@ bool Rm::HasAccessToDir(const Item & dir, bool only_content) // ops, there is no a parent dir return false; - if( !system->CanRemoveRenameChild(*last_but_one_dir, dir.user_id) ) + if( !system->CanRemoveRenameChild(*last_but_one_dir, dir.item_content.user_id) ) return false; } @@ -104,7 +104,7 @@ bool res = false; if( cur->request->is_item ) { - res = system->CanRemoveRenameChild(*cur->request->dir_tab.back(), cur->request->item.user_id); + res = system->CanRemoveRenameChild(*cur->request->dir_tab.back(), cur->request->item.item_content.user_id); } else { @@ -131,16 +131,16 @@ return res; void Rm::Prepare() { // selecting files and symlinks (without directories) - content_dir_iq.SetAll(false, false); - content_dir_iq.sel_parent_id = true; - content_dir_iq.sel_type = true; - content_dir_iq.sel_url = true; - content_dir_iq.sel_file = true; - content_dir_iq.sel_user_id = true; - content_dir_iq.sel_group_id = true; - content_dir_iq.sel_privileges = true; - content_dir_iq.sel_meta = true; - content_dir_iq.WhereType(Item::dir, false); +// content_dir_iq.SetAll(false, false); +// content_dir_iq.sel_parent_id = true; +// content_dir_iq.sel_type = true; +// content_dir_iq.sel_url = true; +// content_dir_iq.sel_file = true; +// content_dir_iq.sel_user_id = true; +// content_dir_iq.sel_group_id = true; +// content_dir_iq.sel_privileges = true; +// content_dir_iq.sel_meta = true; +// content_dir_iq.WhereType(Item::dir, false); } @@ -166,7 +166,7 @@ void Rm::RemoveStaticFile(const Item & item) { RemoveStaticFile(path); - if( item.has_thumb && system->MakeFilePath(item, path, true) ) + if( item.item_content.file_has_thumb && system->MakeFilePath(item, path, true) ) RemoveStaticFile(path); } else @@ -190,7 +190,8 @@ bool Rm::RemoveFile(Item & item) { plugin->Call(WINIX_FILE_PREPARE_TO_REMOVE, &item); - if( db->DelItem(item) == WINIX_ERR_OK ) + //if( db->DelItem(item) == WINIX_ERR_OK ) + if( item.remove() ) { if( item.type == Item::file ) log << log2 << "Rm: deleted file: "; @@ -201,7 +202,7 @@ bool Rm::RemoveFile(Item & item) TemplatesFunctions::pattern_cacher.DeletePattern(item); - if( item.file_type != WINIX_ITEM_FILETYPE_NONE ) + if( item.item_content.file_type != WINIX_ITEM_FILETYPE_NONE ) RemoveStaticFile(item); plugin->Call(WINIX_FILE_REMOVED, &item); @@ -230,7 +231,7 @@ bool Rm::RemoveFileOrSymlink(Item & item, bool check_access) // if there is not 'dir' directory then we can simply remove 'item' if( dir ) { - if( !system->CanRemoveRenameChild(*dir, item.user_id) ) + if( !system->CanRemoveRenameChild(*dir, item.item_content.user_id) ) { log << log1 << "Rm: permission denied to remove: " << item.url << ", id: " << item.id << logend; slog << logerror << T("rm_permission_denied_to") << ": " << item.url << logend; @@ -248,18 +249,27 @@ bool Rm::RemoveFileOrSymlink(long item_id, bool check_access) bool result = false; // selecting files, symlinks and directories - rm_by_id_iq.SetAll(false, false); - rm_by_id_iq.sel_parent_id = true; - rm_by_id_iq.sel_type = true; - rm_by_id_iq.sel_url = true; - rm_by_id_iq.sel_file = true; - rm_by_id_iq.sel_user_id = true; - rm_by_id_iq.sel_group_id = true; - rm_by_id_iq.sel_privileges = true; - rm_by_id_iq.sel_meta = true; - rm_by_id_iq.WhereId(item_id); +// rm_by_id_iq.SetAll(false, false); +// rm_by_id_iq.sel_parent_id = true; +// rm_by_id_iq.sel_type = true; +// rm_by_id_iq.sel_url = true; +// rm_by_id_iq.sel_file = true; +// rm_by_id_iq.sel_user_id = true; +// rm_by_id_iq.sel_group_id = true; +// rm_by_id_iq.sel_privileges = true; +// rm_by_id_iq.sel_meta = true; +// rm_by_id_iq.WhereId(item_id); - if( db->GetItem(rm_by_id_item, rm_by_id_iq) == WINIX_ERR_OK ) + morm::Finder finder(model_connector); + + rm_by_id_item = finder. + select(). + where(). + eq(L"id", item_id). + get(); + + //if( db->GetItem(rm_by_id_item, rm_by_id_iq) == WINIX_ERR_OK ) + if( rm_by_id_item.found() ) { if( rm_by_id_item.type == Item::file || rm_by_id_item.type == Item::symlink ) { @@ -282,18 +292,27 @@ bool Rm::RemoveItemById(long item_id, bool check_access) bool result = false; // selecting files, symlinks and directories - rm_by_id_iq.SetAll(false, false); - rm_by_id_iq.sel_parent_id = true; - rm_by_id_iq.sel_type = true; - rm_by_id_iq.sel_url = true; - rm_by_id_iq.sel_file = true; - rm_by_id_iq.sel_user_id = true; - rm_by_id_iq.sel_group_id = true; - rm_by_id_iq.sel_privileges = true; - rm_by_id_iq.sel_meta = true; - rm_by_id_iq.WhereId(item_id); +// rm_by_id_iq.SetAll(false, false); +// rm_by_id_iq.sel_parent_id = true; +// rm_by_id_iq.sel_type = true; +// rm_by_id_iq.sel_url = true; +// rm_by_id_iq.sel_file = true; +// rm_by_id_iq.sel_user_id = true; +// rm_by_id_iq.sel_group_id = true; +// rm_by_id_iq.sel_privileges = true; +// rm_by_id_iq.sel_meta = true; +// rm_by_id_iq.WhereId(item_id); - if( db->GetItem(rm_by_id_item, rm_by_id_iq) == WINIX_ERR_OK ) + morm::Finder finder(model_connector); + + rm_by_id_item = finder. + select(). + where(). + eq(L"id", item_id). + get(); + + //if( db->GetItem(rm_by_id_item, rm_by_id_iq) == WINIX_ERR_OK ) + if( rm_by_id_item.found() ) { if( rm_by_id_item.type == Item::dir ) { @@ -341,8 +360,16 @@ return result; bool Rm::RemoveDirFiles(long dir_id, bool check_access) { - content_dir_iq.WhereParentId(dir_id); - db->GetItems(content_item_tab, content_dir_iq); +// content_dir_iq.WhereParentId(dir_id); +// db->GetItems(content_item_tab, content_dir_iq); + + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", dir_id). + get_vector(content_item_tab); size_t removed = 0; @@ -362,7 +389,7 @@ void Rm::RemoveCurrentDir(Item * parent_dir, Item * current_dir, bool check_acce { if( check_access ) { - if( !parent_dir || !system->CanRemoveRenameChild(*parent_dir, current_dir->user_id) ) + if( !parent_dir || !system->CanRemoveRenameChild(*parent_dir, current_dir->item_content.user_id) ) { log << log1 << "Rm: permission denied to directory: " << current_dir->url << logend; slog << logerror << T("rm_permission_denied_to") << ": " << current_dir->url << logend; @@ -372,7 +399,8 @@ void Rm::RemoveCurrentDir(Item * parent_dir, Item * current_dir, bool check_acce plugin->Call(WINIX_DIR_PREPARE_TO_REMOVE, current_dir); - if( db->DelDirById(current_dir->id) == WINIX_ERR_OK ) + //if( db->DelDirById(current_dir->id) == WINIX_ERR_OK ) + if( current_dir->remove() ) { long dir_id = current_dir->id; old_url = current_dir->url; diff --git a/winixd/functions/rm.h b/winixd/functions/rm.h index df1dc22..ce6ef6a 100644 --- a/winixd/functions/rm.h +++ b/winixd/functions/rm.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -74,7 +74,7 @@ public: private: // for deleting content in a directory (files and symlinks) - DbItemQuery content_dir_iq; + //DbItemQuery content_dir_iq; std::vector content_item_tab; std::wstring path; @@ -82,7 +82,7 @@ private: std::wstring old_url; // for removing an item by id - DbItemQuery rm_by_id_iq; + //DbItemQuery rm_by_id_iq; Item rm_by_id_item; std::vector rm_path_dir_tab; diff --git a/winixd/functions/sort.cpp b/winixd/functions/sort.cpp index 1ff01c9..9caef7d 100644 --- a/winixd/functions/sort.cpp +++ b/winixd/functions/sort.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2018, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,9 +65,18 @@ bool Sort::HasAccess() void Sort::GetDirContent() { - iq.sel_content = false; - iq.WhereParentId(cur->request->dir_tab.back()->id); - db->GetItems(cur->request->item_tab, iq); +// iq.sel_content = false; +// iq.WhereParentId(cur->request->dir_tab.back()->id); +// db->GetItems(cur->request->item_tab, iq); + + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", cur->request->dir_tab.back()->id). + get_vector(cur->request->item_tab); + system->CheckWriteAccessToItems(cur->request->item_tab); } @@ -127,7 +136,8 @@ void Sort::UpdateSortIndex(Item & item, int sort_index) { item.sort_index = sort_index; - if( db->EditSortIndexItemById(item.id, sort_index) == WINIX_ERR_OK ) + //if( db->EditSortIndexItemById(item.id, sort_index) == WINIX_ERR_OK ) + if( item.update(false, false) ) { log << log2 << "Sort: updated sort index, item_id=" << item.id diff --git a/winixd/functions/sort.h b/winixd/functions/sort.h index 1c0326b..f8fefdf 100644 --- a/winixd/functions/sort.h +++ b/winixd/functions/sort.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2018, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,7 +57,7 @@ public: private: - DbItemQuery iq; + //DbItemQuery iq; std::vector item_tab; // indexes to cur->request->item_tab struct SortPair diff --git a/winixd/functions/subject.cpp b/winixd/functions/subject.cpp index c644d30..437a47f 100644 --- a/winixd/functions/subject.cpp +++ b/winixd/functions/subject.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -76,7 +76,8 @@ void Subject::EditDirSubject() Item & dir = *cur->request->dir_tab.back(); cur->request->PostVar(L"subject", dir.subject); - db->EditSubjectById(dir, dir.id); + dir.update(false, false); + //db->EditSubjectById(dir, dir.id); // !! IMPROVE ME // we need something like WINIX_DIR_CHANGED message @@ -90,7 +91,8 @@ void Subject::EditDirSubject() void Subject::EditFileSubject() { cur->request->PostVar(L"subject", cur->request->item.subject); - db->EditSubjectById(cur->request->item, cur->request->item.id); + cur->request->item.update(false, false); + //db->EditSubjectById(cur->request->item, cur->request->item.id); plugin->Call(WINIX_FILE_CHANGED, &cur->request->item); diff --git a/winixd/functions/template.cpp b/winixd/functions/template.cpp index ac30372..efd44fa 100644 --- a/winixd/functions/template.cpp +++ b/winixd/functions/template.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2016, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -122,11 +122,11 @@ void Template::ChangeTemplate(Item & item) { if( html_template != item.html_template ) { - cur->request->status = db->EditTemplateItemById(item.id, html_template); + item.html_template = html_template; - if( cur->request->status == WINIX_ERR_OK ) + //cur->request->status = db->EditTemplateItemById(item.id, html_template); + if( item.update(false, false) ) { - item.html_template = html_template; PutLog(item); } } diff --git a/winixd/functions/upload.cpp b/winixd/functions/upload.cpp index 562a8a5..269ce85 100644 --- a/winixd/functions/upload.cpp +++ b/winixd/functions/upload.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -154,25 +154,32 @@ void Upload::UploadFile(Item & item, const std::wstring & tmp_filename) { if( UploadSaveStaticFile(item, tmp_filename) ) { - cur->request->status = db->EditFileById(item, item.id); - - plugin->Call(WINIX_FILE_ADDED, &item); - - if( item.file_type == WINIX_ITEM_FILETYPE_IMAGE ) + //cur->request->status = db->EditFileById(item, item.id); + if( item.update(false, true) ) { - if( config->image_resize ) - ResizeImage(item); + plugin->Call(WINIX_FILE_ADDED, &item); - if( config->create_thumb ) - CreateThumb(item); + if( item.item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE ) + { + if( config->image_resize ) + ResizeImage(item); + + if( config->create_thumb ) + CreateThumb(item); + } + + if( is_jquery_upload ) + cur->request->item_tab.push_back(item); + } + else + { + cur->request->status = WINIX_ERR_PERMISSION_DENIED; } - - if( is_jquery_upload ) - cur->request->item_tab.push_back(item); } else { - db->DelItem(item); + item.remove(); + //db->DelItem(item); } } } @@ -208,7 +215,7 @@ void Upload::UploadMulti() cur->request->item.Clear(); // clearing and setting date cur->request->item.parent_id = cur->request->dir_tab.back()->id; cur->request->item.type = Item::file; - cur->request->item.privileges = system->NewFilePrivileges(); + cur->request->item.item_content.privileges = system->NewFilePrivileges(); functions->SetUser(cur->request->item); PostFileTab::iterator i = cur->request->post_file_tab.begin(); @@ -219,8 +226,8 @@ void Upload::UploadMulti() cur->request->item.subject = file_name; cur->request->item.url = file_name; - cur->request->item.file_type = SelectFileType(file_name); - cur->request->item.file_size = i->second.file_size; + cur->request->item.item_content.file_type = SelectFileType(file_name); + cur->request->item.item_content.file_size = i->second.file_size; functions->PrepareUrl(cur->request->item); UploadFile(cur->request->item, i->second.tmp_filename); @@ -243,13 +250,13 @@ void Upload::UploadSingle() functions->ReadItem(cur->request->item, Item::file); // ReadItem() changes the url if it is empty functions->SetUser(cur->request->item); - cur->request->item.privileges = system->NewFilePrivileges(); + cur->request->item.item_content.privileges = system->NewFilePrivileges(); PostFile & post_file = cur->request->post_file_tab.begin()->second; const wchar_t * file_name = post_file.filename.c_str(); - cur->request->item.file_type = SelectFileType(file_name); - cur->request->item.file_size = post_file.file_size; + cur->request->item.item_content.file_type = SelectFileType(file_name); + cur->request->item.item_content.file_size = post_file.file_size; if( !has_subject ) cur->request->item.subject = file_name; @@ -305,7 +312,7 @@ void Upload::CreateAnswer() PT::Space & file = files.AddSpace(L""); file.Add(L"name", req.item_tab[i].url); - file.Add(L"size", req.item_tab[i].file_size); + file.Add(L"size", req.item_tab[i].item_content.file_size); std::wstring & link = file.Add(L"url", L""); system->CreateItemLink(req.item_tab[i], link); @@ -315,11 +322,11 @@ void Upload::CreateAnswer() file.Add(L"deleteType", L"POST"); - if( req.item_tab[i].file_type == WINIX_ITEM_FILETYPE_IMAGE ) + if( req.item_tab[i].item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE ) { std::wstring & thumb = file.Add(L"thumbnailUrl", link); - if( req.item_tab[i].has_thumb ) + if( req.item_tab[i].item_content.file_has_thumb ) thumb += L"/-/thumb"; } @@ -342,12 +349,22 @@ void Upload::MakeGet() { if( cur->request->IsParam(L"jquery_upload") ) { - query.Clear(); - query.WhereParentId(cur->request->dir_tab.back()->id); - query.WhereType(Item::file); - query.WhereFileType(WINIX_ITEM_FILETYPE_NONE, false); +// query.Clear(); +// query.WhereParentId(cur->request->dir_tab.back()->id); +// query.WhereType(Item::file); +// query.WhereFileType(WINIX_ITEM_FILETYPE_NONE, false); - db->GetItems(cur->request->item_tab, query); + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", cur->request->dir_tab.back()->id). + eq(L"type", static_cast(Item::file)). + neq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE). + get_vector(cur->request->item_tab); + + //db->GetItems(cur->request->item_tab, query); CreateAnswer(); } diff --git a/winixd/functions/upload.h b/winixd/functions/upload.h index c97c6df..7ef65ed 100644 --- a/winixd/functions/upload.h +++ b/winixd/functions/upload.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,7 +59,7 @@ public: private: std::wstring path; - DbItemQuery query; + //DbItemQuery query; bool is_jquery_upload; // this object is used in App at the end of a request diff --git a/winixd/main/Makefile.dep b/winixd/main/Makefile.dep index 598c943..b1cd15c 100644 --- a/winixd/main/Makefile.dep +++ b/winixd/main/Makefile.dep @@ -4,10 +4,10 @@ main.o: ../../../winix/winixd/core/app.h main.o: ../../../winix/winixd/core/sessionmanager.h main.o: ../../../winix/winixd/core/sessioncontainer.h main.o: ../../../winix/winixd/core/session.h -main.o: ../../../winix/winixd/core/item.h ../../../pikotools/space/space.h +main.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/user.h +main.o: ../../../pikotools/space/space.h main.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h main.o: ../../../pikotools/convert/inttostr.h -main.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/user.h main.o: ../../../winix/winixd/core/plugindata.h main.o: ../../../winix/winixd/core/rebus.h main.o: ../../../winix/winixd/core/winixbase.h @@ -35,6 +35,16 @@ main.o: ../../../pikotools/convert/patternreplacer.h main.o: ../../../pikotools/convert/strtoint.h main.o: ../../../pikotools/convert/text.h ../../../winix/winixd/core/ipban.h main.o: ../../../winix/winixd/core/cur.h ../../../winix/winixd/core/request.h +main.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +main.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +main.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +main.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +main.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +main.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +main.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +main.o: ../../../morm/src/fieldvaluehelper.h +main.o: ../../../morm/src/flatexpression.h +main.o: ../../../winix/winixd/models/itemcontent.h main.o: ../../../winix/winixd/core/config.h main.o: ../../../winix/winixd/templates/htmltextstream.h main.o: ../../../winix/winixd/core/textstream.h @@ -44,15 +54,8 @@ main.o: ../../../winix/winixd/core/winixmodel.h main.o: ../../../winix/winixd/core/winixbase.h main.o: ../../../winix/winixd/core/plugin.h main.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -main.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -main.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -main.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -main.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -main.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -main.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -main.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -main.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -main.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +main.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +main.o: ../../../morm/src/jsonexpression.h main.o: ../../../morm/src/postgresqlexpression.h main.o: ../../../morm/src/jsonconnector.h main.o: ../../../morm/src/postgresqlconnector.h @@ -68,7 +71,6 @@ main.o: ../../../winix/winixd/db/dbconn.h main.o: ../../../winix/winixd/db/dbtextstream.h main.o: ../../../winix/winixd/core/error.h main.o: ../../../winix/winixd/db/dbitemquery.h -main.o: ../../../winix/winixd/core/item.h main.o: ../../../winix/winixd/db/dbitemcolumns.h main.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h main.o: ../../../winix/winixd/core/dircontainer.h @@ -91,10 +93,10 @@ main.o: ../../../winix/winixd/templates/patterns.h main.o: ../../../winix/winixd/templates/locale.h main.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h main.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h -main.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h -main.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -main.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h -main.o: ../../../ezc/src/patternparser.h +main.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h +main.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +main.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +main.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h main.o: ../../../winix/winixd/notify/notifythread.h main.o: ../../../winix/winixd/core/basethread.h main.o: ../../../winix/winixd/notify/templatesnotify.h diff --git a/winixd/models/Makefile b/winixd/models/Makefile new file mode 100644 index 0000000..aff497a --- /dev/null +++ b/winixd/models/Makefile @@ -0,0 +1,24 @@ +include Makefile.o.dep + +current_path := $(shell pwd) +global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR)) + +winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools + + +all: $(o) + + +%.o: %.cpp + $(CXX) -c $(CXXFLAGS) $(winix_include_paths) $< + + +depend: + makedepend -Y. $(winix_include_paths) -f- *.cpp > Makefile.dep + echo -n "o = " > Makefile.o.dep + ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep + +clean: + rm -f *.o + +include Makefile.dep diff --git a/winixd/models/Makefile.dep b/winixd/models/Makefile.dep new file mode 100644 index 0000000..3a128f4 --- /dev/null +++ b/winixd/models/Makefile.dep @@ -0,0 +1,66 @@ +# DO NOT DELETE + +item.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +item.o: ../../../pikotools/textstream/textstream.h +item.o: ../../../pikotools/space/space.h +item.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h +item.o: ../../../pikotools/convert/inttostr.h +item.o: ../../../pikotools/membuffer/membuffer.h +item.o: ../../../pikotools/textstream/types.h +item.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +item.o: ../../../morm/src/dbconnector.h ../../../pikotools/log/log.h +item.o: ../../../pikotools/log/filelog.h ../../../morm/src/queryresult.h +item.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +item.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +item.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +item.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +item.o: ../../../morm/src/fieldvaluehelper.h +item.o: ../../../morm/src/flatexpression.h +item.o: ../../../winix/winixd/models/itemcontent.h ../../../morm/src/finder.h +item.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h +itemcontent.o: ../../../winix/winixd/models/itemcontent.h +itemcontent.o: ../../../pikotools/space/space.h +itemcontent.o: ../../../pikotools/textstream/types.h +itemcontent.o: ../../../pikotools/date/date.h +itemcontent.o: ../../../pikotools/convert/inttostr.h +itemcontent.o: ../../../morm/src/model.h +itemcontent.o: ../../../pikotools/textstream/textstream.h +itemcontent.o: ../../../pikotools/membuffer/membuffer.h +itemcontent.o: ../../../pikotools/textstream/types.h +itemcontent.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +itemcontent.o: ../../../morm/src/dbconnector.h ../../../pikotools/log/log.h +itemcontent.o: ../../../pikotools/log/filelog.h +itemcontent.o: ../../../morm/src/queryresult.h +itemcontent.o: ../../../morm/src/flatconnector.h +itemcontent.o: ../../../morm/src/dbexpression.h +itemcontent.o: ../../../morm/src/baseexpression.h +itemcontent.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +itemcontent.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +itemcontent.o: ../../../morm/src/finderhelper.h +itemcontent.o: ../../../morm/src/fieldvaluehelper.h +itemcontent.o: ../../../morm/src/flatexpression.h +itemcontent.o: ../../../winix/winixd/core/crypt.h +itemcontent.o: ../../../winix/winixd/core/run.h +itemcontent.o: ../../../winix/winixd/core/winixbase.h +itemcontent.o: ../../../winix/winixd/core/config.h +itemcontent.o: ../../../pikotools/space/spaceparser.h +itemcontent.o: ../../../pikotools/space/space.h +itemcontent.o: ../../../winix/winixd/core/log.h +itemcontent.o: ../../../winix/winixd/core/logmanipulators.h +itemcontent.o: ../../../winix/winixd/core/log.h +itemcontent.o: ../../../winix/winixd/core/synchro.h +itemcontent.o: ../../../winix/winixd/core/filelog.h +itemcontent.o: ../../../winix/winixd/core/lock.h +itemcontent.o: ../../../winix/winixd/core/synchro.h +itemcontent.o: ../../../winix/winixd/core/config.h +itemcontent.o: ../../../winix/winixd/core/user.h +itemcontent.o: ../../../winix/winixd/core/misc.h +itemcontent.o: ../../../winix/winixd/core/requesttypes.h +itemcontent.o: ../../../pikotools/utf8/utf8.h +itemcontent.o: ../../../winix/winixd/core/winix_const.h +itemcontent.o: ../../../pikotools/convert/convert.h +itemcontent.o: ../../../pikotools/convert/inttostr.h +itemcontent.o: ../../../pikotools/convert/patternreplacer.h +itemcontent.o: ../../../pikotools/convert/strtoint.h +itemcontent.o: ../../../pikotools/convert/text.h +itemcontent.o: ../../../pikotools/convert/misc.h diff --git a/winixd/models/Makefile.o.dep b/winixd/models/Makefile.o.dep new file mode 100644 index 0000000..da0f304 --- /dev/null +++ b/winixd/models/Makefile.o.dep @@ -0,0 +1 @@ +o = item.o itemcontent.o \ No newline at end of file diff --git a/winixd/models/item.cpp b/winixd/models/item.cpp new file mode 100644 index 0000000..f71662c --- /dev/null +++ b/winixd/models/item.cpp @@ -0,0 +1,231 @@ +/* + * This file is a part of Winix + * and is distributed under the 2-Clause BSD licence. + * Author: Tomasz Sowa + */ + +/* + * Copyright (c) 2010-2021, 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 "models/item.h" +#include "finder.h" + + +namespace Winix +{ + + + + +Item::Item() +{ + Clear(); +} + + + +void Item::map_fields() +{ + int type_helper = static_cast(type); + + field(L"id", id, false, false, true); + field(L"parent_id", parent_id); + field(L"type", type_helper); + field(L"url", url); + field(L"subject", subject); + field(L"template", html_template); + field(L"sort_index", sort_index); + //field(L"content_id", content_id); + field(L"content_id", item_content, true, true, true); + + // may we should add a method setTypeFromInt(int t)? + type = static_cast(type_helper); +} + + +void Item::table_name(PT::TextStream & stream) +{ + stream << "core.item"; +} + + +void Item::before_insert() +{ + // IMPROVEME if prepare_status is false then update the 'url' with the 'id' + // add a method: update_url() + url_was_prepared_correctly = prepare_url(); +} + + +void Item::after_insert() +{ + get_last_sequence(L"core.item_id_seq", id); + + if( !url_was_prepared_correctly ) + { + // update_url(); + // what about an error from update_url()? + } +} + + +bool Item::update(morm::ModelData * model_data, bool url_was_changed, bool update_whole_tree) +{ + bool prepare_url_status = true; + + if( url_was_changed ) + { + prepare_url_status = prepare_url(); + } + + bool update_status = morm::Model::update(model_data, update_whole_tree); + + if( update_status ) + { + if( !prepare_url_status ) + { + // IMPROVEME add update_url() method + // set 'url' to the same value as 'id' + //update_status = update_url(); + } + } + + return update_status; +} + + +bool Item::update(morm::ModelData & model_data, bool url_was_changed, bool update_whole_tree) +{ + return update(&model_data, url_was_changed, update_whole_tree); +} + + +bool Item::update(bool url_was_changed, bool update_whole_tree) +{ + return update(nullptr, url_was_changed, update_whole_tree); +} + + + + + +void Item::Clear() +{ + id = -1; + parent_id = -1; + type = none; + url.clear(); + subject.clear(); + html_template.clear(); + sort_index = 0; + content_id = -1; + item_content.Clear(); + + // used only when inserting, not saved to the database + url_was_prepared_correctly = true; +} + + +long Item::calc_items_by_url(long parent_id, const std::wstring & url) +{ + morm::Finder finder(model_connector); + + CalcItemsHelper helper = finder. + prepare_to_select(). + raw("select count(id) as size from core.item"). + where(). + eq(L"parent_id", parent_id). + eq(L"url", url). + get(); + + return helper.size; +} + + + +bool Item::prepare_url() +{ +std::wstring temp_url; +bool is_that_url; +int index = 1; +const int max_index = 99; +wchar_t appendix[20]; +size_t appendix_len = sizeof(appendix) / sizeof(wchar_t); + + appendix[0] = 0; + + // only root dir may not have the url + if( parent_id != -1 && url.empty() ) + url = L"empty"; // IMPROVEME move me to locales + + do + { + temp_url = url; + temp_url += appendix; + + long size = calc_items_by_url(parent_id, temp_url); + + if( size > 0 ) + { + swprintf(appendix, appendix_len, L"_(%d)", ++index); + is_that_url = true; + } + else + { + url = temp_url; + is_that_url = false; + } + } + while( is_that_url && index <= max_index ); + +return !is_that_url; +} + + + +void Item::do_migration(morm::ModelConnector * model_connector) +{ + return; + /////// + + morm::Finder finder(model_connector); + + std::list list = finder.select().where().eq(L"type", static_cast(Item::dir)).eq(L"content_id", -1).get_list(); + + for(Item & item : list) + { + item.item_content.set_save_mode(morm::Model::DO_INSERT_ON_SAVE); + item.save(); + } + +} + + + +} // namespace Winix + diff --git a/winixd/models/item.h b/winixd/models/item.h new file mode 100644 index 0000000..058e715 --- /dev/null +++ b/winixd/models/item.h @@ -0,0 +1,180 @@ +/* + * This file is a part of Winix + * and is distributed under the 2-Clause BSD licence. + * Author: Tomasz Sowa + */ + +/* + * Copyright (c) 2008-2021, 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_models_item +#define headerfile_winix_models_item + +#include +#include "model.h" +#include "models/itemcontent.h" + + +namespace Winix +{ + +// IMPROVEME rename me and move to a better place +class CalcItemsHelper : public morm::Model +{ +public: + + long size; + + void map_fields() + { + field(L"size", size); + } + +}; + + +class Item : public morm::Model +{ +public: + + + enum Type + { + dir = 0, + file = 1, + symlink = 2, + + none = 1000 + }; + + + + /* + * + */ + long id; + + /* + * + */ + long parent_id; + + /* + * may change to int? + */ + Type type; + + /* + * + */ + std::wstring url; + + /* + * + */ + std::wstring subject; + + /* + * + */ + std::wstring html_template; + + /* + * sort index used when displaying a group of items + */ + int sort_index; + + /* + * may not needed? + * the id is in the ItemContent object + */ + long content_id; + + /* + * + */ + ItemContent item_content; + + + + + Item(); + + void map_fields(); + void table_name(PT::TextStream & stream); + void before_insert(); + void after_insert(); + + /* + * what about clear() from Model? + */ + void Clear(); + + + bool prepare_url(); + + + /* + * CHECKME + * make sure update(...) methods from Model are not available + */ + bool update(morm::ModelData * model_data, bool url_was_changed, bool update_whole_tree = true); + bool update(morm::ModelData & model_data, bool url_was_changed, bool update_whole_tree = true); + bool update(bool url_was_changed, bool update_whole_tree = true); + // IMPROVEME make the same for save() methods + + + /* + * IMPROVEME + * when removing we should check whether the item_content.references is zero and them remove it + * in other cases only decrement item_content.references + * + */ + + + /* + * temporary + */ + static void do_migration(morm::ModelConnector * model_connector); + +protected: + + bool url_was_prepared_correctly; + + + long calc_items_by_url(long parent_id, const std::wstring & url); + + +}; + + +} // namespace Winix + + + +#endif diff --git a/winixd/core/item.cpp b/winixd/models/itemcontent.cpp similarity index 50% rename from winixd/core/item.cpp rename to winixd/models/itemcontent.cpp index b829191..4548890 100644 --- a/winixd/core/item.cpp +++ b/winixd/models/itemcontent.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,9 +32,10 @@ * */ -#include "item.h" -#include "misc.h" -#include "crypt.h" +#include "models/itemcontent.h" +#include "core/crypt.h" +#include "core/misc.h" + namespace Winix @@ -43,68 +44,114 @@ namespace Winix -Item::Item() +ItemContent::ItemContent() { Clear(); } -// !! IMPROVE ME +// IMPROVEME move me to morm +void ItemContent::field(const wchar_t * db_field_name, PT::Space & space) +{ + + +} + + +void ItemContent::map_fields() +{ + int content_raw_type_helper = static_cast(content_raw_type); + int content_parsed_type_helper = static_cast(content_parsed_type); + + field(L"id", id, false, false, true); + field(L"references", references); + field(L"user_id", user_id); + field(L"group_id", group_id); + field(L"guest_name", guest_name); + field(L"modification_user_id", modification_user_id); + field(L"privileges", privileges); + field(L"date_creation", date_creation); + field(L"date_modification", date_modification); + field(L"link_to", link_to); + field(L"link_redirect", link_redirect); + field(L"file_path", file_path); + field(L"file_fs", file_fs); + field(L"file_type", file_type); + field(L"file_has_thumb", file_has_thumb); + field(L"file_hash", file_hash); + field(L"file_hash_type", file_hash_type); + field(L"file_size", file_size); + field(L"content_raw", content_raw); + field(L"content_raw_type", content_raw_type_helper); + field(L"content_parsed", content_parsed); + field(L"content_parsed_type", content_parsed_type_helper); +// field(L"meta", meta); +// field(L"meta_admin", meta_admin); + + content_raw_type = static_cast(content_raw_type_helper); + content_parsed_type = static_cast(content_parsed_type_helper); +} + + +void ItemContent::table_name(PT::TextStream & stream) +{ + stream << "core.content"; +} + + +void ItemContent::after_insert() +{ + get_last_sequence(L"core.content_id_seq", id); +} + + +// !! IMPROVEME // now we have Request::start_time and Request::start_date // we can somehow get the current time from the request // may setting the date should be completetly removed from here? -void Item::SetDateToNow() +void ItemContent::SetDateToNow() { date_creation = std::time(0); date_modification = date_creation; } -void Item::SetDateModifyToNow() +void ItemContent::SetDateModifyToNow() { date_modification = std::time(0); } -void Item::Clear() +void ItemContent::Clear() { id = -1; - + references = 1; + user_id = -1; group_id = -1; - privileges = 0; - modification_user_id = -1; - guest_name.clear(); - - subject.clear(); - content.clear(); - modify_index = 0; - url.clear(); - - content_type = ct_formatted_text; - - type = none; - parent_id = -1; + modification_user_id = -1; + privileges = 0; link_to.clear(); link_redirect = false; - content_id = -1; - ref = 1; - file_path.clear(); file_fs = -1; file_type = WINIX_ITEM_FILETYPE_NONE; - hash.clear(); - hash_type = WINIX_CRYPT_HASH_NONE; + file_has_thumb = false; + file_hash.clear(); + file_hash_type = WINIX_CRYPT_HASH_NONE; file_size = 0; - has_thumb = false; - html_template.clear(); - sort_index = 0; + + content_raw.clear(); + content_raw_type = ct_formatted_text; + content_parsed.clear(); + content_parsed_type = ct_formatted_text; + meta.Clear(); - ameta.Clear(); + meta_admin.Clear(); SetDateToNow(); } @@ -114,14 +161,14 @@ void Item::Clear() * we're using the HtmlFilter only for those contents * */ -bool Item::CanContentBeHtmlFiltered(Item::ContentType ct) +bool ItemContent::CanContentBeHtmlFiltered(ItemContent::ContentType ct) { return ct == ct_text || ct == ct_formatted_text || ct == ct_html || ct == ct_bbcode; } -bool Item::CanContentBeHtmlFiltered() +bool ItemContent::CanContentBeHtmlFiltered() { - return CanContentBeHtmlFiltered(content_type); + return CanContentBeHtmlFiltered(content_raw_type); } diff --git a/winixd/models/itemcontent.h b/winixd/models/itemcontent.h new file mode 100644 index 0000000..7bf05d9 --- /dev/null +++ b/winixd/models/itemcontent.h @@ -0,0 +1,244 @@ +/* + * This file is a part of Winix + * and is distributed under the 2-Clause BSD licence. + * Author: Tomasz Sowa + */ + +/* + * Copyright (c) 2021, 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_models_itemcontent +#define headerfile_winix_models_itemcontent + +#include +#include "space/space.h" +#include "date/date.h" +#include "model.h" + + +namespace Winix +{ + + +#define WINIX_ITEM_FILETYPE_NONE 0 +#define WINIX_ITEM_FILETYPE_IMAGE 1 +#define WINIX_ITEM_FILETYPE_DOCUMENT 2 +#define WINIX_ITEM_FILETYPE_VIDEO 3 +#define WINIX_ITEM_FILETYPE_UNKNOWN 10 + + + + +class ItemContent : public morm::Model +{ +public: + + /* + * may we should add ct_none? and this will be default (set in Clear method) + */ + enum ContentType + { + ct_text = 0, + ct_formatted_text, + ct_html, + ct_bbcode, + ct_other, // no auto-formatting is applied + }; + + + + /* + * record id + */ + long id; + + /* + * how many Items references to this + */ + int references; + + /* + * user owner + * -1 means the item was created by a not logged in user and in such a case a 'guest_name' field is set + */ + long user_id; + + /* + * group owner + */ + long group_id; + + /* + * a guest name in a case when the item was created by a not logged in user (user_id is -1) + */ + std::wstring guest_name; + + /* + * who has modified the item last + * this field is not taken into account when checking permissions + */ + long modification_user_id; + + /* + * privileges, e.g: 0755 + * IMPROVEME need some info here + */ + int privileges; + + /* + * when the object was created + */ + PT::Date date_creation; + + /* + * when the object was last modified + */ + PT::Date date_modification; + + + + /* + * name of a link in the case when type is a symlink or a directory + */ + std::wstring link_to; + + /* + * whether or not winix should make a redirect to link_to link + * IMPROVE ME should it be 'bool'? + */ + int link_redirect; + + + + /* + * static file (if exists) + * relative file path + */ + std::wstring file_path; + + /* + * file system type where the file was saved + */ + int file_fs; + + /* + * file type (none, image, doc, etc) + */ + int file_type; + + /* + * whether or not we have a thumbnail + */ + bool file_has_thumb; + + /* + * file hash (md4, md5, ...) + */ + std::wstring file_hash; + + /* + * hash type WINIX_CRYPT_HASH_* (see crypt.h) + */ + int file_hash_type; + + /* + * size of the file + */ + size_t file_size; + + + + /* + * object content as provided by the user + */ + std::wstring content_raw; + + /* + * raw content type + */ + ContentType content_raw_type; + + /* + * parsed object content + * IMPROVEME not used in winix yet + */ + std::wstring content_parsed; + + /* + * parsed content type + * IMPROVEME not used in winix yet + */ + ContentType content_parsed_type; + + + + /* + * meta information + * additional information in the form af a Space struct + */ + PT::Space meta; + + /* + * admin meta information + * additional information available to edit only by an admin + */ + PT::Space meta_admin; + + + ItemContent(); + + void map_fields(); + void table_name(PT::TextStream & stream); + void after_insert(); + + + void SetDateToNow(); + void SetDateModifyToNow(); + + + /* + * what about clear() from Model? + */ + void Clear(); + + static bool CanContentBeHtmlFiltered(ItemContent::ContentType ct); + bool CanContentBeHtmlFiltered(); + + + + // IMPROVEME move me to morm + using morm::Model::field; + void field(const wchar_t * db_field_name, PT::Space & space); +}; + + +} // namespace Winix + + + +#endif diff --git a/winixd/notify/Makefile.dep b/winixd/notify/Makefile.dep index 0b708cc..983c3a9 100644 --- a/winixd/notify/Makefile.dep +++ b/winixd/notify/Makefile.dep @@ -37,14 +37,14 @@ notify.o: ../../../winix/winixd/core/winixmodel.h notify.o: ../../../winix/winixd/core/plugin.h notify.o: ../../../winix/winixd/core/pluginmsg.h notify.o: ../../../winix/winixd/core/plugindata.h -notify.o: ../../../winix/winixd/core/winixbase.h ../../../morm/src/morm.h -notify.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h +notify.o: ../../../winix/winixd/core/winixbase.h notify.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h notify.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -notify.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -notify.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -notify.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -notify.o: ../../../morm/src/finderhelper.h +notify.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +notify.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h +notify.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h +notify.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +notify.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h notify.o: ../../../morm/src/fieldvaluehelper.h notify.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h notify.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h @@ -60,6 +60,8 @@ notify.o: ../../../winix/winixd/core/lastcontainer.h notify.o: ../../../winix/winixd/core/cur.h notify.o: ../../../winix/winixd/core/request.h notify.o: ../../../winix/winixd/core/requesttypes.h +notify.o: ../../../winix/winixd/models/item.h +notify.o: ../../../winix/winixd/models/itemcontent.h notify.o: ../../../winix/winixd/core/error.h notify.o: ../../../winix/winixd/core/config.h notify.o: ../../../winix/winixd/core/textstream.h @@ -73,7 +75,6 @@ notify.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h notify.o: ../../../winix/winixd/db/dbtextstream.h notify.o: ../../../winix/winixd/core/error.h notify.o: ../../../winix/winixd/db/dbitemquery.h -notify.o: ../../../winix/winixd/core/item.h notify.o: ../../../winix/winixd/db/dbitemcolumns.h notify.o: ../../../winix/winixd/core/user.h notify.o: ../../../winix/winixd/core/group.h @@ -166,11 +167,11 @@ notifythread.o: ../../../winix/winixd/core/plugin.h notifythread.o: ../../../winix/winixd/core/pluginmsg.h notifythread.o: ../../../winix/winixd/core/plugindata.h notifythread.o: ../../../winix/winixd/core/winixbase.h -notifythread.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -notifythread.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h +notifythread.o: ../../../morm/src/modelconnector.h notifythread.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h notifythread.o: ../../../morm/src/queryresult.h -notifythread.o: ../../../morm/src/flatconnector.h +notifythread.o: ../../../morm/src/flatconnector.h ../../../morm/src/morm.h +notifythread.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h notifythread.o: ../../../morm/src/dbexpression.h notifythread.o: ../../../morm/src/baseexpression.h notifythread.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h @@ -204,6 +205,8 @@ notifythread.o: ../../../winix/winixd/core/lastcontainer.h notifythread.o: ../../../winix/winixd/core/cur.h notifythread.o: ../../../winix/winixd/core/request.h notifythread.o: ../../../winix/winixd/core/requesttypes.h +notifythread.o: ../../../winix/winixd/models/item.h +notifythread.o: ../../../winix/winixd/models/itemcontent.h notifythread.o: ../../../winix/winixd/core/error.h notifythread.o: ../../../winix/winixd/core/config.h notifythread.o: ../../../winix/winixd/core/textstream.h @@ -219,7 +222,6 @@ notifythread.o: ../../../winix/winixd/db/dbconn.h notifythread.o: ../../../winix/winixd/db/dbtextstream.h notifythread.o: ../../../winix/winixd/core/error.h notifythread.o: ../../../winix/winixd/db/dbitemquery.h -notifythread.o: ../../../winix/winixd/core/item.h notifythread.o: ../../../winix/winixd/db/dbitemcolumns.h notifythread.o: ../../../winix/winixd/core/user.h notifythread.o: ../../../winix/winixd/core/group.h diff --git a/winixd/plugins/export/Makefile.dep b/winixd/plugins/export/Makefile.dep index 5957718..4e6bcae 100644 --- a/winixd/plugins/export/Makefile.dep +++ b/winixd/plugins/export/Makefile.dep @@ -5,13 +5,12 @@ 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/item.h +edb.o: ../../../../winix/winixd/core/requesttypes.h +edb.o: ../../../../pikotools/textstream/textstream.h edb.o: ../../../../pikotools/space/space.h edb.o: ../../../../pikotools/textstream/types.h edb.o: ../../../../pikotools/date/date.h edb.o: ../../../../pikotools/convert/inttostr.h -edb.o: ../../../../winix/winixd/core/requesttypes.h -edb.o: ../../../../pikotools/textstream/textstream.h edb.o: ../../../../pikotools/membuffer/membuffer.h edb.o: ../../../../pikotools/textstream/types.h edb.o: ../../../../pikotools/utf8/utf8.h @@ -37,9 +36,20 @@ edb.o: ../../../../winix/winixd/core/error.h export.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 ../../../../morm/src/model.h +edb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +edb.o: ../../../../morm/src/dbconnector.h ../../../../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/flatexpression.h +edb.o: ../../../../winix/winixd/models/itemcontent.h edb.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h edb.o: ../../../../winix/winixd/db/dbitemquery.h -edb.o: ../../../../winix/winixd/core/item.h edb.o: ../../../../winix/winixd/db/dbitemcolumns.h edb.o: ../../../../winix/winixd/core/user.h edb.o: ../../../../winix/winixd/core/group.h @@ -56,17 +66,8 @@ edb.o: ../../../../winix/winixd/core/winixmodel.h edb.o: ../../../../winix/winixd/core/plugin.h edb.o: ../../../../winix/winixd/core/pluginmsg.h edb.o: ../../../../winix/winixd/core/plugindata.h ../../../../morm/src/morm.h -edb.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h -edb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h -edb.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h -edb.o: ../../../../morm/src/flatconnector.h -edb.o: ../../../../morm/src/dbexpression.h -edb.o: ../../../../morm/src/baseexpression.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/flatexpression.h ../../../../morm/src/finder.h -edb.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h +edb.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +edb.o: ../../../../morm/src/jsonexpression.h edb.o: ../../../../morm/src/postgresqlexpression.h edb.o: ../../../../morm/src/jsonconnector.h edb.o: ../../../../morm/src/postgresqlconnector.h @@ -99,13 +100,13 @@ 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/winixbase.h -exportinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -exportinfo.o: ../../../../morm/src/model.h exportinfo.o: ../../../../morm/src/modelconnector.h exportinfo.o: ../../../../morm/src/clearer.h exportinfo.o: ../../../../morm/src/dbconnector.h exportinfo.o: ../../../../morm/src/queryresult.h exportinfo.o: ../../../../morm/src/flatconnector.h +exportinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h +exportinfo.o: ../../../../morm/src/model.h exportinfo.o: ../../../../morm/src/dbexpression.h exportinfo.o: ../../../../morm/src/baseexpression.h exportinfo.o: ../../../../morm/src/modelenv.h @@ -122,12 +123,12 @@ exportinfo.o: ../../../../morm/src/jsonconnector.h exportinfo.o: ../../../../morm/src/postgresqlconnector.h exportinfo.o: ../../../../morm/src/postgresqlqueryresult.h exportinfo.o: ../../../../winix/winixd/core/dirs.h -exportinfo.o: ../../../../winix/winixd/core/item.h exportinfo.o: ../../../../winix/winixd/core/dircontainer.h +exportinfo.o: ../../../../winix/winixd/models/item.h +exportinfo.o: ../../../../winix/winixd/models/itemcontent.h exportinfo.o: ../../../../winix/winixd/db/db.h exportinfo.o: ../../../../winix/winixd/db/dbbase.h exportinfo.o: ../../../../winix/winixd/db/dbitemquery.h -exportinfo.o: ../../../../winix/winixd/core/item.h exportinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h exportinfo.o: ../../../../winix/winixd/core/user.h exportinfo.o: ../../../../winix/winixd/core/group.h @@ -175,9 +176,10 @@ exportinfo.o: ../../../../winix/winixd/templates/patterns.h exportinfo.o: ../../../../winix/winixd/templates/locale.h exportinfo.o: ../../../../winix/winixd/templates/localefilter.h exportinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -exportinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -exportinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -exportinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +exportinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +exportinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +exportinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +exportinfo.o: ../../../../ezc/src/pattern.h exportinfo.o: ../../../../ezc/src/expressionparser.h exportinfo.o: ../../../../ezc/src/patternparser.h exportinfo.o: ../../../../winix/winixd/notify/notifythread.h @@ -196,13 +198,12 @@ exportinfo.o: ../../../../pikotools/convert/text.h exportthread.o: exportthread.h ../../../../winix/winixd/core/basethread.h exportthread.o: message.h ../../../../winix/winixd/core/log.h exportthread.o: ../../../../winix/winixd/core/misc.h -exportthread.o: ../../../../winix/winixd/core/item.h +exportthread.o: ../../../../winix/winixd/core/requesttypes.h +exportthread.o: ../../../../pikotools/textstream/textstream.h exportthread.o: ../../../../pikotools/space/space.h exportthread.o: ../../../../pikotools/textstream/types.h exportthread.o: ../../../../pikotools/date/date.h exportthread.o: ../../../../pikotools/convert/inttostr.h -exportthread.o: ../../../../winix/winixd/core/requesttypes.h -exportthread.o: ../../../../pikotools/textstream/textstream.h exportthread.o: ../../../../pikotools/membuffer/membuffer.h exportthread.o: ../../../../pikotools/textstream/types.h exportthread.o: ../../../../pikotools/utf8/utf8.h @@ -215,7 +216,6 @@ exportthread.o: ../../../../pikotools/convert/text.h exportthread.o: ../../../../winix/winixd/core/misc.h exportthread.o: ../../../../pikotools/convert/text.h funexport.o: funexport.h ../../../../winix/winixd/functions/functionbase.h -funexport.o: ../../../../winix/winixd/core/item.h funexport.o: ../../../../winix/winixd/db/db.h funexport.o: ../../../../winix/winixd/db/dbbase.h funexport.o: ../../../../winix/winixd/db/dbitemquery.h @@ -234,7 +234,24 @@ funexport.o: ../../../../winix/winixd/core/requesttypes.h funexport.o: ../../../../pikotools/textstream/textstream.h funexport.o: ../../../../pikotools/membuffer/membuffer.h funexport.o: ../../../../pikotools/textstream/types.h -funexport.o: ../../../../winix/winixd/core/item.h +funexport.o: ../../../../winix/winixd/models/item.h +funexport.o: ../../../../morm/src/model.h +funexport.o: ../../../../morm/src/modelconnector.h +funexport.o: ../../../../morm/src/clearer.h +funexport.o: ../../../../morm/src/dbconnector.h +funexport.o: ../../../../pikotools/log/log.h +funexport.o: ../../../../pikotools/log/filelog.h +funexport.o: ../../../../morm/src/queryresult.h +funexport.o: ../../../../morm/src/flatconnector.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 ../../../../morm/src/modeldata.h +funexport.o: ../../../../morm/src/cursorhelper.h +funexport.o: ../../../../morm/src/finderhelper.h +funexport.o: ../../../../morm/src/fieldvaluehelper.h +funexport.o: ../../../../morm/src/flatexpression.h +funexport.o: ../../../../winix/winixd/models/itemcontent.h funexport.o: ../../../../winix/winixd/core/error.h funexport.o: ../../../../winix/winixd/core/config.h funexport.o: ../../../../winix/winixd/core/textstream.h @@ -255,8 +272,6 @@ funexport.o: ../../../../winix/winixd/core/config.h funexport.o: ../../../../pikotools/space/spaceparser.h funexport.o: ../../../../winix/winixd/core/log.h funexport.o: ../../../../winix/winixd/core/logmanipulators.h -funexport.o: ../../../../pikotools/log/log.h -funexport.o: ../../../../pikotools/log/filelog.h funexport.o: ../../../../winix/winixd/core/system.h funexport.o: ../../../../winix/winixd/core/job.h funexport.o: ../../../../winix/winixd/core/basethread.h @@ -270,21 +285,8 @@ 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 -funexport.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -funexport.o: ../../../../morm/src/model.h -funexport.o: ../../../../morm/src/modelconnector.h -funexport.o: ../../../../morm/src/clearer.h -funexport.o: ../../../../morm/src/dbconnector.h -funexport.o: ../../../../morm/src/queryresult.h -funexport.o: ../../../../morm/src/flatconnector.h -funexport.o: ../../../../morm/src/dbexpression.h -funexport.o: ../../../../morm/src/baseexpression.h -funexport.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h -funexport.o: ../../../../morm/src/cursorhelper.h -funexport.o: ../../../../morm/src/finderhelper.h -funexport.o: ../../../../morm/src/fieldvaluehelper.h -funexport.o: ../../../../morm/src/flatexpression.h -funexport.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +funexport.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +funexport.o: ../../../../morm/src/cursor.h funexport.o: ../../../../morm/src/jsonexpression.h funexport.o: ../../../../morm/src/postgresqlexpression.h funexport.o: ../../../../morm/src/jsonconnector.h @@ -319,9 +321,10 @@ funexport.o: ../../../../winix/winixd/templates/patterns.h funexport.o: ../../../../winix/winixd/templates/locale.h funexport.o: ../../../../winix/winixd/templates/localefilter.h funexport.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -funexport.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -funexport.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -funexport.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +funexport.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +funexport.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +funexport.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +funexport.o: ../../../../ezc/src/pattern.h funexport.o: ../../../../ezc/src/expressionparser.h funexport.o: ../../../../ezc/src/patternparser.h funexport.o: ../../../../winix/winixd/notify/notifythread.h @@ -350,7 +353,19 @@ 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/winixbase.h exportthread.h +init.o: ../../../../winix/winixd/core/winixbase.h +init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +init.o: ../../../../pikotools/date/date.h +init.o: ../../../../pikotools/convert/inttostr.h +init.o: ../../../../morm/src/dbconnector.h +init.o: ../../../../pikotools/textstream/textstream.h +init.o: ../../../../pikotools/space/space.h +init.o: ../../../../pikotools/textstream/types.h +init.o: ../../../../pikotools/membuffer/membuffer.h +init.o: ../../../../pikotools/textstream/types.h +init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h +init.o: ../../../../morm/src/queryresult.h +init.o: ../../../../morm/src/flatconnector.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 @@ -363,23 +378,11 @@ init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../winix/winixd/core/log.h init.o: ../../../../winix/winixd/core/logmanipulators.h -init.o: ../../../../pikotools/log/log.h -init.o: ../../../../pikotools/textstream/textstream.h -init.o: ../../../../pikotools/space/space.h -init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/date/date.h -init.o: ../../../../pikotools/convert/inttostr.h -init.o: ../../../../pikotools/membuffer/membuffer.h -init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h init.o: ../../../../winix/winixd/core/plugin.h ../../../../morm/src/morm.h init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h -init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h -init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h -init.o: ../../../../morm/src/flatconnector.h init.o: ../../../../morm/src/dbexpression.h init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h @@ -393,11 +396,11 @@ init.o: ../../../../morm/src/jsonconnector.h init.o: ../../../../morm/src/postgresqlconnector.h init.o: ../../../../morm/src/postgresqlqueryresult.h init.o: ../../../../winix/winixd/core/dirs.h -init.o: ../../../../winix/winixd/core/item.h init.o: ../../../../winix/winixd/core/dircontainer.h +init.o: ../../../../winix/winixd/models/item.h +init.o: ../../../../winix/winixd/models/itemcontent.h init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h init.o: ../../../../winix/winixd/db/dbitemquery.h -init.o: ../../../../winix/winixd/core/item.h init.o: ../../../../winix/winixd/db/dbitemcolumns.h init.o: ../../../../winix/winixd/core/user.h init.o: ../../../../winix/winixd/core/group.h @@ -445,10 +448,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h init.o: ../../../../winix/winixd/templates/locale.h init.o: ../../../../winix/winixd/templates/localefilter.h init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -init.o: ../../../../ezc/src/expressionparser.h +init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h init.o: ../../../../ezc/src/patternparser.h init.o: ../../../../winix/winixd/notify/notifythread.h init.o: ../../../../winix/winixd/notify/templatesnotify.h diff --git a/winixd/plugins/export/exportinfo.cpp b/winixd/plugins/export/exportinfo.cpp index d9d13dd..f98cf4b 100644 --- a/winixd/plugins/export/exportinfo.cpp +++ b/winixd/plugins/export/exportinfo.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2018, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -188,7 +188,7 @@ void ExportInfo::SendFile(const Item & item, bool thumb, bool put_to_recurrence_ system->dirs.MakePath(item.parent_id, msg.path); msg.path += item.url; - if( item.file_type != WINIX_ITEM_FILETYPE_NONE ) + if( item.item_content.file_type != WINIX_ITEM_FILETYPE_NONE ) { msg.type = WINIX_PL_EXPORT_TYPE_CREATE_FILE_STATIC; @@ -220,7 +220,7 @@ void ExportInfo::SendFile(const Item & item, bool thumb, bool put_to_recurrence_ msg.http_server = exp.http_server; system->dirs.MakePath(exp_dir->dir_id, msg.src_dir); - if( !item.file_path.empty() && thumb ) // !! uzyc file_type + if( !item.item_content.file_path.empty() && thumb ) // !! uzyc file_type msg.path.insert(0, L"/download"); // !! do konfiga if( !exp.ftp_dir.empty() ) @@ -299,15 +299,26 @@ void ExportInfo::SendDir(long dir_id) // send all non-static files from a directory void ExportInfo::SendAllFilesFromDir(long dir_id) { - iq_dir.SetAll(false, false); - iq_dir.sel_parent_id = true; - iq_dir.sel_url = true; - iq_dir.sel_file = true; - iq_dir.WhereParentId(dir_id); - iq_dir.WhereType(Item::file); - iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE); +// iq_dir.SetAll(false, false); +// iq_dir.sel_parent_id = true; +// iq_dir.sel_url = true; +// iq_dir.sel_file = true; +// iq_dir.WhereParentId(dir_id); +// iq_dir.WhereType(Item::file); +// iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE); - db->GetItems(dir_items, iq_dir); + + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", dir_id). + eq(L"type", static_cast(Item::file)). + eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE). + get_vector(dir_items); + + //db->GetItems(dir_items, iq_dir); for(size_t i=0 ; iname == L"export" ) - AdditionalExport(item, *item.meta.spaces[i]); + if( item.item_content.meta.spaces[i]->name == L"export" ) + AdditionalExport(item, *item.item_content.meta.spaces[i]); } } diff --git a/winixd/plugins/export/exportinfo.h b/winixd/plugins/export/exportinfo.h index 1a56271..676fc36 100644 --- a/winixd/plugins/export/exportinfo.h +++ b/winixd/plugins/export/exportinfo.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ #include "edb.h" #include "message.h" #include "exportthread.h" -#include "core/winixbase.h" +#include "core/winixmodel.h" @@ -52,7 +52,7 @@ namespace Export { -class ExportInfo : public WinixBase +class ExportInfo : public WinixModel { public: @@ -93,7 +93,7 @@ private: Export exp; std::wstring tmp_dir; std::vector export_dirs; - DbItemQuery iq_dir; + //DbItemQuery iq_dir; std::vector dir_items; std::vector additional_export; std::vector additional_export_dir_tab; diff --git a/winixd/plugins/export/funexport.cpp b/winixd/plugins/export/funexport.cpp index 4d1e855..041a310 100644 --- a/winixd/plugins/export/funexport.cpp +++ b/winixd/plugins/export/funexport.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2012-2014, Tomasz Sowa + * Copyright (c) 2012-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -68,7 +68,7 @@ void FunExport::ExportFile(const Item & item) { log << log4 << "Export: exporting file: url: " << item.url << ", id: " << item.id << logend; - if( item.file_type == WINIX_ITEM_FILETYPE_NONE ) + if( item.item_content.file_type == WINIX_ITEM_FILETYPE_NONE ) { export_info->SendFile(item, false, true); } @@ -86,25 +86,36 @@ void FunExport::ExportDir(const Item & dir, bool static_files_too) log << log4 << "Export: exporting directory: url: " << dir.url << ", id: " << dir.id << logend; - iq_dir.SetAll(false, false); - iq_dir.sel_parent_id = true; - iq_dir.sel_url = true; - iq_dir.sel_file = true; - iq_dir.WhereParentId(dir.id); - iq_dir.WhereType(Item::file); +// iq_dir.SetAll(false, false); +// iq_dir.sel_parent_id = true; +// iq_dir.sel_url = true; +// iq_dir.sel_file = true; +// iq_dir.WhereParentId(dir.id); +// iq_dir.WhereType(Item::file); + + + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", dir.id). + eq(L"type", static_cast(Item::file)); if( !static_files_too ) - iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE); + { + //iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE); + finder.eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE); + } - db->GetItems(dir_items, iq_dir); + finder.get_vector(dir_items); + //db->GetItems(dir_items, iq_dir); for(size_t i=0 ; idirs.FindFirstChild(dir.id); for( ; i != system->dirs.ParentEnd() ; i = system->dirs.NextChild(i) ) diff --git a/winixd/plugins/export/funexport.h b/winixd/plugins/export/funexport.h index 384fcc6..431038d 100644 --- a/winixd/plugins/export/funexport.h +++ b/winixd/plugins/export/funexport.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2012-2014, Tomasz Sowa + * Copyright (c) 2012-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,7 +66,7 @@ public: private: ExportInfo * export_info; - DbItemQuery iq_dir; + //DbItemQuery iq_dir; std::vector dir_items; void Export(); diff --git a/winixd/plugins/export/init.cpp b/winixd/plugins/export/init.cpp index 11e5a22..8f5d273 100644 --- a/winixd/plugins/export/init.cpp +++ b/winixd/plugins/export/init.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2018, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -113,7 +113,7 @@ void SendFileAdded(PluginInfo & info) if( item ) { - if( item->file_type == WINIX_ITEM_FILETYPE_IMAGE && info.config->image_resize ) + if( item->item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE && info.config->image_resize ) { // there'll be a next message WINIX_IMAGE_RESIZED info.log << log4 << "Export: image will be resized, waiting..." << logend; @@ -124,7 +124,7 @@ void SendFileAdded(PluginInfo & info) export_info.SendFile(*item); export_info.SendDir(item->parent_id); - if( item->file_type == WINIX_ITEM_FILETYPE_NONE ) + if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE ) export_info.SendAllFilesFromDir(item->parent_id); } } @@ -141,7 +141,7 @@ void SendFileChanged(PluginInfo & info) export_info.SendFile(*item); export_info.SendDir(item->parent_id); - if( item->file_type == WINIX_ITEM_FILETYPE_NONE ) + if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE ) export_info.SendAllFilesFromDir(item->parent_id); } } @@ -157,7 +157,7 @@ void SendFileCopied(PluginInfo & info) export_info.ResetRecurrenceCheck(); export_info.SendDir(item->parent_id); - if( item->file_type == WINIX_ITEM_FILETYPE_NONE ) + if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE ) { export_info.SendAllFilesFromDir(item->parent_id); } @@ -203,7 +203,7 @@ void SendFilePrepareMove(PluginInfo & info) if( item ) { - if( item->file_type == WINIX_ITEM_FILETYPE_NONE ) + if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE ) { export_info.ResetRecurrenceCheck(); export_info.SendAllFilesFromDir(item->parent_id); @@ -221,7 +221,7 @@ void FileRemoved(PluginInfo & info) export_info.ResetRecurrenceCheck(); export_info.SendDir(item->parent_id); - if( item->file_type == WINIX_ITEM_FILETYPE_NONE ) + if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE ) export_info.SendAllFilesFromDir(item->parent_id); } } diff --git a/winixd/plugins/gallery/Makefile.dep b/winixd/plugins/gallery/Makefile.dep index 8b6bf42..b44b99f 100644 --- a/winixd/plugins/gallery/Makefile.dep +++ b/winixd/plugins/gallery/Makefile.dep @@ -1,20 +1,18 @@ # DO NOT DELETE gallery.o: gallery.h ../../../../winix/winixd/functions/functionbase.h -gallery.o: ../../../../winix/winixd/core/item.h -gallery.o: ../../../../pikotools/space/space.h -gallery.o: ../../../../pikotools/textstream/types.h -gallery.o: ../../../../pikotools/date/date.h -gallery.o: ../../../../pikotools/convert/inttostr.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/item.h gallery.o: ../../../../winix/winixd/core/requesttypes.h gallery.o: ../../../../pikotools/textstream/textstream.h +gallery.o: ../../../../pikotools/space/space.h +gallery.o: ../../../../pikotools/textstream/types.h +gallery.o: ../../../../pikotools/date/date.h +gallery.o: ../../../../pikotools/convert/inttostr.h gallery.o: ../../../../pikotools/membuffer/membuffer.h gallery.o: ../../../../pikotools/textstream/types.h gallery.o: ../../../../pikotools/utf8/utf8.h @@ -44,6 +42,20 @@ gallery.o: ../../../../winix/winixd/core/user.h gallery.o: ../../../../winix/winixd/core/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: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h +gallery.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h +gallery.o: ../../../../morm/src/queryresult.h +gallery.o: ../../../../morm/src/flatconnector.h +gallery.o: ../../../../morm/src/dbexpression.h +gallery.o: ../../../../morm/src/baseexpression.h +gallery.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h +gallery.o: ../../../../morm/src/modeldata.h +gallery.o: ../../../../morm/src/cursorhelper.h +gallery.o: ../../../../morm/src/finderhelper.h +gallery.o: ../../../../morm/src/fieldvaluehelper.h +gallery.o: ../../../../morm/src/flatexpression.h +gallery.o: ../../../../winix/winixd/models/itemcontent.h gallery.o: ../../../../winix/winixd/core/ugcontainer.h gallery.o: ../../../../winix/winixd/core/request.h gallery.o: ../../../../winix/winixd/core/error.h @@ -59,19 +71,8 @@ gallery.o: ../../../../winix/winixd/core/winixmodel.h gallery.o: ../../../../winix/winixd/core/plugin.h gallery.o: ../../../../winix/winixd/core/pluginmsg.h gallery.o: ../../../../winix/winixd/core/plugindata.h -gallery.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -gallery.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h -gallery.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h -gallery.o: ../../../../morm/src/queryresult.h -gallery.o: ../../../../morm/src/flatconnector.h -gallery.o: ../../../../morm/src/dbexpression.h -gallery.o: ../../../../morm/src/baseexpression.h -gallery.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h -gallery.o: ../../../../morm/src/cursorhelper.h -gallery.o: ../../../../morm/src/finderhelper.h -gallery.o: ../../../../morm/src/fieldvaluehelper.h -gallery.o: ../../../../morm/src/flatexpression.h -gallery.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +gallery.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +gallery.o: ../../../../morm/src/cursor.h gallery.o: ../../../../morm/src/jsonexpression.h gallery.o: ../../../../morm/src/postgresqlexpression.h gallery.o: ../../../../morm/src/jsonconnector.h @@ -106,9 +107,10 @@ gallery.o: ../../../../winix/winixd/templates/patterns.h gallery.o: ../../../../winix/winixd/templates/locale.h gallery.o: ../../../../winix/winixd/templates/localefilter.h gallery.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -gallery.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -gallery.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -gallery.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +gallery.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +gallery.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +gallery.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +gallery.o: ../../../../ezc/src/pattern.h gallery.o: ../../../../ezc/src/expressionparser.h gallery.o: ../../../../ezc/src/patternparser.h gallery.o: ../../../../winix/winixd/notify/notifythread.h @@ -128,25 +130,44 @@ gallery.o: ../../../../winix/winixd/core/system.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 -galleryinfo.o: galleryinfo.h ../../../../winix/winixd/core/item.h +galleryinfo.o: galleryinfo.h ../../../../winix/winixd/models/item.h +galleryinfo.o: ../../../../morm/src/model.h +galleryinfo.o: ../../../../pikotools/textstream/textstream.h galleryinfo.o: ../../../../pikotools/space/space.h galleryinfo.o: ../../../../pikotools/textstream/types.h galleryinfo.o: ../../../../pikotools/date/date.h galleryinfo.o: ../../../../pikotools/convert/inttostr.h +galleryinfo.o: ../../../../pikotools/membuffer/membuffer.h +galleryinfo.o: ../../../../pikotools/textstream/types.h +galleryinfo.o: ../../../../morm/src/modelconnector.h +galleryinfo.o: ../../../../morm/src/clearer.h +galleryinfo.o: ../../../../morm/src/dbconnector.h +galleryinfo.o: ../../../../pikotools/log/log.h +galleryinfo.o: ../../../../pikotools/log/filelog.h +galleryinfo.o: ../../../../morm/src/queryresult.h +galleryinfo.o: ../../../../morm/src/flatconnector.h +galleryinfo.o: ../../../../morm/src/dbexpression.h +galleryinfo.o: ../../../../morm/src/baseexpression.h +galleryinfo.o: ../../../../morm/src/morm_types.h +galleryinfo.o: ../../../../morm/src/modelenv.h +galleryinfo.o: ../../../../morm/src/modeldata.h +galleryinfo.o: ../../../../morm/src/cursorhelper.h +galleryinfo.o: ../../../../morm/src/finderhelper.h +galleryinfo.o: ../../../../morm/src/fieldvaluehelper.h +galleryinfo.o: ../../../../morm/src/flatexpression.h +galleryinfo.o: ../../../../winix/winixd/models/itemcontent.h init.o: gallery.h ../../../../winix/winixd/functions/functionbase.h -init.o: ../../../../winix/winixd/core/item.h -init.o: ../../../../pikotools/space/space.h -init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/date/date.h -init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../winix/winixd/db/db.h ../../../../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/item.h init.o: ../../../../winix/winixd/core/requesttypes.h init.o: ../../../../pikotools/textstream/textstream.h +init.o: ../../../../pikotools/space/space.h +init.o: ../../../../pikotools/textstream/types.h +init.o: ../../../../pikotools/date/date.h +init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../pikotools/membuffer/membuffer.h init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/utf8/utf8.h @@ -175,6 +196,18 @@ init.o: ../../../../winix/winixd/core/user.h init.o: ../../../../winix/winixd/core/group.h init.o: ../../../../winix/winixd/core/dircontainer.h init.o: ../../../../winix/winixd/core/winixbase.h +init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h +init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h +init.o: ../../../../morm/src/flatconnector.h +init.o: ../../../../morm/src/dbexpression.h +init.o: ../../../../morm/src/baseexpression.h +init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h +init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h +init.o: ../../../../morm/src/finderhelper.h +init.o: ../../../../morm/src/fieldvaluehelper.h +init.o: ../../../../morm/src/flatexpression.h +init.o: ../../../../winix/winixd/models/itemcontent.h init.o: ../../../../winix/winixd/core/ugcontainer.h init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/error.h @@ -190,17 +223,7 @@ init.o: ../../../../winix/winixd/core/winixmodel.h init.o: ../../../../winix/winixd/core/plugin.h init.o: ../../../../winix/winixd/core/pluginmsg.h init.o: ../../../../winix/winixd/core/plugindata.h -init.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h -init.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h -init.o: ../../../../morm/src/queryresult.h -init.o: ../../../../morm/src/flatconnector.h -init.o: ../../../../morm/src/dbexpression.h -init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h -init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h -init.o: ../../../../morm/src/finderhelper.h -init.o: ../../../../morm/src/fieldvaluehelper.h -init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h +init.o: ../../../../morm/src/morm.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/jsonconnector.h @@ -235,10 +258,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h init.o: ../../../../winix/winixd/templates/locale.h init.o: ../../../../winix/winixd/templates/localefilter.h init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -init.o: ../../../../ezc/src/expressionparser.h +init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h init.o: ../../../../ezc/src/patternparser.h init.o: ../../../../winix/winixd/notify/notifythread.h init.o: ../../../../winix/winixd/core/basethread.h @@ -304,20 +327,18 @@ init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h init.o: ../../../../winix/winixd/core/htmlfilter.h templates.o: gallery.h ../../../../winix/winixd/functions/functionbase.h -templates.o: ../../../../winix/winixd/core/item.h -templates.o: ../../../../pikotools/space/space.h -templates.o: ../../../../pikotools/textstream/types.h -templates.o: ../../../../pikotools/date/date.h -templates.o: ../../../../pikotools/convert/inttostr.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/item.h templates.o: ../../../../winix/winixd/core/requesttypes.h templates.o: ../../../../pikotools/textstream/textstream.h +templates.o: ../../../../pikotools/space/space.h +templates.o: ../../../../pikotools/textstream/types.h +templates.o: ../../../../pikotools/date/date.h +templates.o: ../../../../pikotools/convert/inttostr.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../pikotools/utf8/utf8.h @@ -347,6 +368,22 @@ templates.o: ../../../../winix/winixd/core/user.h templates.o: ../../../../winix/winixd/core/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: ../../../../morm/src/model.h +templates.o: ../../../../morm/src/modelconnector.h +templates.o: ../../../../morm/src/clearer.h +templates.o: ../../../../morm/src/dbconnector.h +templates.o: ../../../../morm/src/queryresult.h +templates.o: ../../../../morm/src/flatconnector.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 ../../../../morm/src/modeldata.h +templates.o: ../../../../morm/src/cursorhelper.h +templates.o: ../../../../morm/src/finderhelper.h +templates.o: ../../../../morm/src/fieldvaluehelper.h +templates.o: ../../../../morm/src/flatexpression.h +templates.o: ../../../../winix/winixd/models/itemcontent.h templates.o: ../../../../winix/winixd/core/ugcontainer.h templates.o: ../../../../winix/winixd/core/request.h templates.o: ../../../../winix/winixd/core/error.h @@ -362,21 +399,8 @@ templates.o: ../../../../winix/winixd/core/winixmodel.h templates.o: ../../../../winix/winixd/core/plugin.h templates.o: ../../../../winix/winixd/core/pluginmsg.h templates.o: ../../../../winix/winixd/core/plugindata.h -templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -templates.o: ../../../../morm/src/model.h -templates.o: ../../../../morm/src/modelconnector.h -templates.o: ../../../../morm/src/clearer.h -templates.o: ../../../../morm/src/dbconnector.h -templates.o: ../../../../morm/src/queryresult.h -templates.o: ../../../../morm/src/flatconnector.h -templates.o: ../../../../morm/src/dbexpression.h -templates.o: ../../../../morm/src/baseexpression.h -templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h -templates.o: ../../../../morm/src/cursorhelper.h -templates.o: ../../../../morm/src/finderhelper.h -templates.o: ../../../../morm/src/fieldvaluehelper.h -templates.o: ../../../../morm/src/flatexpression.h -templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +templates.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +templates.o: ../../../../morm/src/cursor.h templates.o: ../../../../morm/src/jsonexpression.h templates.o: ../../../../morm/src/postgresqlexpression.h templates.o: ../../../../morm/src/jsonconnector.h @@ -411,9 +435,10 @@ templates.o: ../../../../winix/winixd/templates/patterns.h templates.o: ../../../../winix/winixd/templates/locale.h templates.o: ../../../../winix/winixd/templates/localefilter.h templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -templates.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +templates.o: ../../../../ezc/src/pattern.h templates.o: ../../../../ezc/src/expressionparser.h templates.o: ../../../../ezc/src/patternparser.h templates.o: ../../../../winix/winixd/notify/notifythread.h diff --git a/winixd/plugins/gallery/gallery.cpp b/winixd/plugins/gallery/gallery.cpp index eb6b9d5..d075518 100644 --- a/winixd/plugins/gallery/gallery.cpp +++ b/winixd/plugins/gallery/gallery.cpp @@ -80,19 +80,28 @@ void Gallery::SortPointers() void Gallery::MakeGetDir() { - iq.SetAll(false, false); - iq.sel_parent_id = true; - iq.sel_subject = true; - iq.sel_url = true; - iq.sel_type = true; - iq.sel_file = true; - iq.sel_sort_index = true; - iq.sel_meta = true; +// iq.SetAll(false, false); +// iq.sel_parent_id = true; +// iq.sel_subject = true; +// iq.sel_url = true; +// iq.sel_type = true; +// iq.sel_file = true; +// iq.sel_sort_index = true; +// iq.sel_meta = true; +// +// iq.WhereParentId(cur->request->dir_tab.back()->id); +// iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); - iq.WhereParentId(cur->request->dir_tab.back()->id); - iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); + morm::Finder finder(model_connector); - db->GetItems(gallery_info->item_tab, iq); + finder. + select(). + where(). + eq(L"parent_id", cur->request->dir_tab.back()->id). + eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE). + get_vector(gallery_info->item_tab); + + //db->GetItems(gallery_info->item_tab, iq); CreatePointers(); } diff --git a/winixd/plugins/gallery/gallery.h b/winixd/plugins/gallery/gallery.h index 49e1583..c39a02e 100644 --- a/winixd/plugins/gallery/gallery.h +++ b/winixd/plugins/gallery/gallery.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,7 +59,7 @@ public: private: GalleryInfo * gallery_info; - DbItemQuery iq; + //DbItemQuery iq; void CreatePointers(); void SortPointers(); diff --git a/winixd/plugins/gallery/galleryinfo.h b/winixd/plugins/gallery/galleryinfo.h index a93ad4a..b3ee659 100644 --- a/winixd/plugins/gallery/galleryinfo.h +++ b/winixd/plugins/gallery/galleryinfo.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,7 +36,7 @@ #define headerfile_winix_plugins_gallery_galleryinfo #include -#include "core/item.h" +#include "models/item.h" namespace Winix { diff --git a/winixd/plugins/gallery/templates.cpp b/winixd/plugins/gallery/templates.cpp index 7baa8af..49410bb 100644 --- a/winixd/plugins/gallery/templates.cpp +++ b/winixd/plugins/gallery/templates.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2016, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -121,7 +121,7 @@ void gallery_tab_meta_str(Info & i) if( gallery_index < gallery_info.item_sort_tab.size() ) { Item & item = *gallery_info.item_sort_tab[gallery_index]; - item.meta.Serialize(i.out, true, false); + item.item_content.meta.Serialize(i.out, true, false); } } @@ -131,7 +131,7 @@ void gallery_tab_meta(Info & i) if( gallery_index < gallery_info.item_sort_tab.size() ) { Item & item = *gallery_info.item_sort_tab[gallery_index]; - space_value(i, item.meta); + space_value(i, item.item_content.meta); } } @@ -141,7 +141,7 @@ void gallery_tab_meta_tab(Info & i) if( gallery_index < gallery_info.item_sort_tab.size() ) { Item & item = *gallery_info.item_sort_tab[gallery_index]; - space_list_tab(i, item.meta); + space_list_tab(i, item.item_content.meta); } } @@ -151,7 +151,7 @@ void gallery_tab_meta_tab_value(Info & i) if( gallery_index < gallery_info.item_sort_tab.size() ) { Item & item = *gallery_info.item_sort_tab[gallery_index]; - space_list_tab_value(i, item.meta, L"gallery_tab_meta_tab"); + space_list_tab_value(i, item.item_content.meta, L"gallery_tab_meta_tab"); } } @@ -161,7 +161,7 @@ void gallery_tab_meta_tab_has_next(Info & i) if( gallery_index < gallery_info.item_sort_tab.size() ) { Item & item = *gallery_info.item_sort_tab[gallery_index]; - space_list_tab_has_next(i, item.meta, L"gallery_tab_meta_tab"); + space_list_tab_has_next(i, item.item_content.meta, L"gallery_tab_meta_tab"); } } diff --git a/winixd/plugins/group/Makefile.dep b/winixd/plugins/group/Makefile.dep index 52e0174..32feaef 100644 --- a/winixd/plugins/group/Makefile.dep +++ b/winixd/plugins/group/Makefile.dep @@ -27,13 +27,12 @@ groupinfo.o: ../../../../winix/winixd/core/plugin.h groupinfo.o: ../../../../winix/winixd/core/pluginmsg.h groupinfo.o: ../../../../winix/winixd/core/plugindata.h groupinfo.o: ../../../../winix/winixd/core/winixbase.h -groupinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -groupinfo.o: ../../../../morm/src/model.h groupinfo.o: ../../../../morm/src/modelconnector.h groupinfo.o: ../../../../morm/src/clearer.h groupinfo.o: ../../../../morm/src/dbconnector.h groupinfo.o: ../../../../morm/src/queryresult.h -groupinfo.o: ../../../../morm/src/flatconnector.h +groupinfo.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h +groupinfo.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h groupinfo.o: ../../../../morm/src/dbexpression.h groupinfo.o: ../../../../morm/src/baseexpression.h groupinfo.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h @@ -53,8 +52,9 @@ groupinfo.o: ../../../../winix/winixd/core/job.h groupinfo.o: ../../../../winix/winixd/core/basethread.h groupinfo.o: ../../../../winix/winixd/core/winixmodel.h groupinfo.o: ../../../../winix/winixd/core/dirs.h -groupinfo.o: ../../../../winix/winixd/core/item.h groupinfo.o: ../../../../winix/winixd/core/dircontainer.h +groupinfo.o: ../../../../winix/winixd/models/item.h +groupinfo.o: ../../../../winix/winixd/models/itemcontent.h groupinfo.o: ../../../../winix/winixd/db/db.h groupinfo.o: ../../../../winix/winixd/db/dbbase.h groupinfo.o: ../../../../winix/winixd/db/dbconn.h @@ -70,7 +70,6 @@ groupinfo.o: ../../../../pikotools/convert/strtoint.h groupinfo.o: ../../../../pikotools/convert/text.h groupinfo.o: ../../../../winix/winixd/core/error.h groupinfo.o: ../../../../winix/winixd/db/dbitemquery.h -groupinfo.o: ../../../../winix/winixd/core/item.h groupinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h groupinfo.o: ../../../../winix/winixd/core/user.h groupinfo.o: ../../../../winix/winixd/core/group.h @@ -107,9 +106,10 @@ groupinfo.o: ../../../../winix/winixd/templates/patterns.h groupinfo.o: ../../../../winix/winixd/templates/locale.h groupinfo.o: ../../../../winix/winixd/templates/localefilter.h groupinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -groupinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -groupinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -groupinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +groupinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +groupinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +groupinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +groupinfo.o: ../../../../ezc/src/pattern.h groupinfo.o: ../../../../ezc/src/expressionparser.h groupinfo.o: ../../../../ezc/src/patternparser.h groupinfo.o: ../../../../winix/winixd/notify/notifythread.h @@ -153,11 +153,11 @@ groups.o: ../../../../winix/winixd/core/plugin.h groups.o: ../../../../winix/winixd/core/pluginmsg.h groups.o: ../../../../winix/winixd/core/plugindata.h groups.o: ../../../../winix/winixd/core/winixbase.h -groups.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -groups.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h +groups.o: ../../../../morm/src/modelconnector.h groups.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h groups.o: ../../../../morm/src/queryresult.h -groups.o: ../../../../morm/src/flatconnector.h +groups.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h +groups.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h groups.o: ../../../../morm/src/dbexpression.h groups.o: ../../../../morm/src/baseexpression.h groups.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h @@ -176,8 +176,9 @@ groups.o: ../../../../winix/winixd/core/job.h groups.o: ../../../../winix/winixd/core/basethread.h groups.o: ../../../../winix/winixd/core/winixmodel.h groups.o: ../../../../winix/winixd/core/dirs.h -groups.o: ../../../../winix/winixd/core/item.h groups.o: ../../../../winix/winixd/core/dircontainer.h +groups.o: ../../../../winix/winixd/models/item.h +groups.o: ../../../../winix/winixd/models/itemcontent.h groups.o: ../../../../winix/winixd/db/db.h groups.o: ../../../../winix/winixd/db/dbbase.h groups.o: ../../../../winix/winixd/db/dbconn.h @@ -193,7 +194,6 @@ groups.o: ../../../../pikotools/convert/strtoint.h groups.o: ../../../../pikotools/convert/text.h groups.o: ../../../../winix/winixd/core/error.h groups.o: ../../../../winix/winixd/db/dbitemquery.h -groups.o: ../../../../winix/winixd/core/item.h groups.o: ../../../../winix/winixd/db/dbitemcolumns.h groups.o: ../../../../winix/winixd/core/user.h groups.o: ../../../../winix/winixd/core/group.h @@ -230,9 +230,10 @@ groups.o: ../../../../winix/winixd/templates/patterns.h groups.o: ../../../../winix/winixd/templates/locale.h groups.o: ../../../../winix/winixd/templates/localefilter.h groups.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -groups.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -groups.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -groups.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +groups.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +groups.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +groups.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +groups.o: ../../../../ezc/src/pattern.h groups.o: ../../../../ezc/src/expressionparser.h groups.o: ../../../../ezc/src/patternparser.h groups.o: ../../../../winix/winixd/notify/notifythread.h @@ -253,7 +254,18 @@ 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/winixbase.h groupinfo.h groups.h +init.o: ../../../../winix/winixd/core/winixbase.h +init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +init.o: ../../../../pikotools/date/date.h +init.o: ../../../../pikotools/convert/inttostr.h +init.o: ../../../../morm/src/dbconnector.h +init.o: ../../../../pikotools/textstream/textstream.h +init.o: ../../../../pikotools/space/space.h +init.o: ../../../../pikotools/membuffer/membuffer.h +init.o: ../../../../pikotools/textstream/types.h +init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h +init.o: ../../../../morm/src/queryresult.h +init.o: ../../../../morm/src/flatconnector.h groupinfo.h groups.h init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../pikotools/textstream/types.h @@ -264,22 +276,12 @@ 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/logmanipulators.h -init.o: ../../../../pikotools/log/log.h -init.o: ../../../../pikotools/textstream/textstream.h -init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h -init.o: ../../../../pikotools/convert/inttostr.h -init.o: ../../../../pikotools/membuffer/membuffer.h -init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/synchro.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/plugin.h ../../../../morm/src/morm.h init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h -init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h -init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h -init.o: ../../../../morm/src/flatconnector.h init.o: ../../../../morm/src/dbexpression.h init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h @@ -297,8 +299,9 @@ init.o: ../../../../winix/winixd/core/job.h init.o: ../../../../winix/winixd/core/basethread.h init.o: ../../../../winix/winixd/core/winixmodel.h init.o: ../../../../winix/winixd/core/dirs.h -init.o: ../../../../winix/winixd/core/item.h init.o: ../../../../winix/winixd/core/dircontainer.h +init.o: ../../../../winix/winixd/models/item.h +init.o: ../../../../winix/winixd/models/itemcontent.h init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h init.o: ../../../../winix/winixd/db/dbconn.h init.o: ../../../../winix/winixd/db/dbtextstream.h @@ -313,7 +316,6 @@ init.o: ../../../../pikotools/convert/strtoint.h init.o: ../../../../pikotools/convert/text.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/db/dbitemquery.h -init.o: ../../../../winix/winixd/core/item.h init.o: ../../../../winix/winixd/db/dbitemcolumns.h init.o: ../../../../winix/winixd/core/user.h init.o: ../../../../winix/winixd/core/group.h @@ -350,10 +352,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h init.o: ../../../../winix/winixd/templates/locale.h init.o: ../../../../winix/winixd/templates/localefilter.h init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -init.o: ../../../../ezc/src/expressionparser.h +init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h init.o: ../../../../ezc/src/patternparser.h init.o: ../../../../winix/winixd/notify/notifythread.h init.o: ../../../../winix/winixd/core/basethread.h @@ -417,14 +419,13 @@ init.o: ../../../../winix/winixd/functions/vim.h init.o: ../../../../winix/winixd/core/htmlfilter.h templates.o: ../../../../winix/winixd/templates/templates.h templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -templates.o: ../../../../ezc/src/blocks.h -templates.o: ../../../../winix/winixd/core/item.h -templates.o: ../../../../pikotools/space/space.h -templates.o: ../../../../pikotools/date/date.h -templates.o: ../../../../pikotools/convert/inttostr.h +templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h templates.o: ../../../../pikotools/utf8/utf8.h templates.o: ../../../../pikotools/textstream/textstream.h +templates.o: ../../../../pikotools/space/space.h +templates.o: ../../../../pikotools/date/date.h +templates.o: ../../../../pikotools/convert/inttostr.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h @@ -442,7 +443,6 @@ templates.o: ../../../../pikotools/convert/patternreplacer.h templates.o: ../../../../pikotools/convert/strtoint.h templates.o: ../../../../pikotools/convert/text.h templates.o: ../../../../winix/winixd/templates/patterncacher.h -templates.o: ../../../../winix/winixd/core/item.h templates.o: ../../../../winix/winixd/core/winixbase.h templates.o: ../../../../winix/winixd/core/config.h templates.o: ../../../../pikotools/space/spaceparser.h @@ -455,6 +455,22 @@ templates.o: ../../../../winix/winixd/core/synchro.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/models/item.h +templates.o: ../../../../morm/src/model.h +templates.o: ../../../../morm/src/modelconnector.h +templates.o: ../../../../morm/src/clearer.h +templates.o: ../../../../morm/src/dbconnector.h +templates.o: ../../../../morm/src/queryresult.h +templates.o: ../../../../morm/src/flatconnector.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 ../../../../morm/src/modeldata.h +templates.o: ../../../../morm/src/cursorhelper.h +templates.o: ../../../../morm/src/finderhelper.h +templates.o: ../../../../morm/src/fieldvaluehelper.h +templates.o: ../../../../morm/src/flatexpression.h +templates.o: ../../../../winix/winixd/models/itemcontent.h templates.o: ../../../../winix/winixd/templates/indexpatterns.h templates.o: ../../../../winix/winixd/templates/patterns.h templates.o: ../../../../winix/winixd/templates/locale.h @@ -506,21 +522,8 @@ templates.o: ../../../../winix/winixd/core/winixsystem.h templates.o: ../../../../winix/winixd/core/winixmodel.h templates.o: ../../../../winix/winixd/core/plugin.h templates.o: ../../../../winix/winixd/core/pluginmsg.h -templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -templates.o: ../../../../morm/src/model.h -templates.o: ../../../../morm/src/modelconnector.h -templates.o: ../../../../morm/src/clearer.h -templates.o: ../../../../morm/src/dbconnector.h -templates.o: ../../../../morm/src/queryresult.h -templates.o: ../../../../morm/src/flatconnector.h -templates.o: ../../../../morm/src/dbexpression.h -templates.o: ../../../../morm/src/baseexpression.h -templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h -templates.o: ../../../../morm/src/cursorhelper.h -templates.o: ../../../../morm/src/finderhelper.h -templates.o: ../../../../morm/src/fieldvaluehelper.h -templates.o: ../../../../morm/src/flatexpression.h -templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +templates.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +templates.o: ../../../../morm/src/cursor.h templates.o: ../../../../morm/src/jsonexpression.h templates.o: ../../../../morm/src/postgresqlexpression.h templates.o: ../../../../morm/src/jsonconnector.h diff --git a/winixd/plugins/group/groupinfo.cpp b/winixd/plugins/group/groupinfo.cpp index d8afc35..1187a65 100644 --- a/winixd/plugins/group/groupinfo.cpp +++ b/winixd/plugins/group/groupinfo.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -173,7 +173,7 @@ void GroupInfo::ReadGroupsConf(Mounts & mounts, bool skip_existing_configs) groups_wrap[mount.dir_id].file_name = file_name; groups_wrap[mount.dir_id].groups.set_dependency(this); - if( !ParseGroups(config_file.content, groups_wrap[mount.dir_id].groups) ) + if( !ParseGroups(config_file.item_content.content_raw, groups_wrap[mount.dir_id].groups) ) groups_wrap[mount.dir_id].to_delete = true; } else diff --git a/winixd/plugins/group/groupinfo.h b/winixd/plugins/group/groupinfo.h index 240120b..a42c6f9 100644 --- a/winixd/plugins/group/groupinfo.h +++ b/winixd/plugins/group/groupinfo.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,10 +39,10 @@ #include #include "groups.h" #include "space/spaceparser.h" -#include "core/item.h" #include "core/system.h" #include "core/config.h" #include "core/winixrequest.h" +#include "models/item.h" namespace Winix diff --git a/winixd/plugins/mailregister/Makefile.dep b/winixd/plugins/mailregister/Makefile.dep index a20033d..2c7ebe9 100644 --- a/winixd/plugins/mailregister/Makefile.dep +++ b/winixd/plugins/mailregister/Makefile.dep @@ -2,20 +2,18 @@ funregistermail_showusers.o: funregistermail_showusers.h funregistermail_showusers.o: ../../../../winix/winixd/functions/functionbase.h -funregistermail_showusers.o: ../../../../winix/winixd/core/item.h -funregistermail_showusers.o: ../../../../pikotools/space/space.h -funregistermail_showusers.o: ../../../../pikotools/textstream/types.h -funregistermail_showusers.o: ../../../../pikotools/date/date.h -funregistermail_showusers.o: ../../../../pikotools/convert/inttostr.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/item.h funregistermail_showusers.o: ../../../../winix/winixd/core/requesttypes.h funregistermail_showusers.o: ../../../../pikotools/textstream/textstream.h +funregistermail_showusers.o: ../../../../pikotools/space/space.h +funregistermail_showusers.o: ../../../../pikotools/textstream/types.h +funregistermail_showusers.o: ../../../../pikotools/date/date.h +funregistermail_showusers.o: ../../../../pikotools/convert/inttostr.h funregistermail_showusers.o: ../../../../pikotools/membuffer/membuffer.h funregistermail_showusers.o: ../../../../pikotools/textstream/types.h funregistermail_showusers.o: ../../../../pikotools/utf8/utf8.h @@ -45,6 +43,23 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/user.h funregistermail_showusers.o: ../../../../winix/winixd/core/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: ../../../../morm/src/model.h +funregistermail_showusers.o: ../../../../morm/src/modelconnector.h +funregistermail_showusers.o: ../../../../morm/src/clearer.h +funregistermail_showusers.o: ../../../../morm/src/dbconnector.h +funregistermail_showusers.o: ../../../../morm/src/queryresult.h +funregistermail_showusers.o: ../../../../morm/src/flatconnector.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 +funregistermail_showusers.o: ../../../../morm/src/finderhelper.h +funregistermail_showusers.o: ../../../../morm/src/fieldvaluehelper.h +funregistermail_showusers.o: ../../../../morm/src/flatexpression.h +funregistermail_showusers.o: ../../../../winix/winixd/models/itemcontent.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 @@ -61,21 +76,6 @@ 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: ../../../../morm/src/morm.h -funregistermail_showusers.o: ../../../../morm/src/morm_types.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/dbconnector.h -funregistermail_showusers.o: ../../../../morm/src/queryresult.h -funregistermail_showusers.o: ../../../../morm/src/flatconnector.h -funregistermail_showusers.o: ../../../../morm/src/dbexpression.h -funregistermail_showusers.o: ../../../../morm/src/baseexpression.h -funregistermail_showusers.o: ../../../../morm/src/modelenv.h -funregistermail_showusers.o: ../../../../morm/src/modeldata.h -funregistermail_showusers.o: ../../../../morm/src/cursorhelper.h -funregistermail_showusers.o: ../../../../morm/src/finderhelper.h -funregistermail_showusers.o: ../../../../morm/src/fieldvaluehelper.h -funregistermail_showusers.o: ../../../../morm/src/flatexpression.h funregistermail_showusers.o: ../../../../morm/src/finder.h funregistermail_showusers.o: ../../../../morm/src/cursor.h funregistermail_showusers.o: ../../../../morm/src/jsonexpression.h @@ -114,6 +114,7 @@ funregistermail_showusers.o: ../../../../winix/winixd/templates/localefilter.h funregistermail_showusers.o: ../../../../ezc/src/ezc.h funregistermail_showusers.o: ../../../../ezc/src/generator.h funregistermail_showusers.o: ../../../../ezc/src/blocks.h +funregistermail_showusers.o: ../../../../ezc/src/item.h funregistermail_showusers.o: ../../../../ezc/src/cache.h funregistermail_showusers.o: ../../../../ezc/src/functions.h funregistermail_showusers.o: ../../../../ezc/src/funinfo.h @@ -144,20 +145,18 @@ funregistermail_showusers.o: ../../../../winix/winixd/db/dbbase.h funregistermail_showusers.o: ../../../../winix/winixd/core/dirs.h funregistermail.o: funregistermail.h funregistermail.o: ../../../../winix/winixd/functions/functionbase.h -funregistermail.o: ../../../../winix/winixd/core/item.h -funregistermail.o: ../../../../pikotools/space/space.h -funregistermail.o: ../../../../pikotools/textstream/types.h -funregistermail.o: ../../../../pikotools/date/date.h -funregistermail.o: ../../../../pikotools/convert/inttostr.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/item.h funregistermail.o: ../../../../winix/winixd/core/requesttypes.h funregistermail.o: ../../../../pikotools/textstream/textstream.h +funregistermail.o: ../../../../pikotools/space/space.h +funregistermail.o: ../../../../pikotools/textstream/types.h +funregistermail.o: ../../../../pikotools/date/date.h +funregistermail.o: ../../../../pikotools/convert/inttostr.h funregistermail.o: ../../../../pikotools/membuffer/membuffer.h funregistermail.o: ../../../../pikotools/textstream/types.h funregistermail.o: ../../../../pikotools/utf8/utf8.h @@ -187,6 +186,23 @@ funregistermail.o: ../../../../winix/winixd/core/user.h funregistermail.o: ../../../../winix/winixd/core/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: ../../../../morm/src/model.h +funregistermail.o: ../../../../morm/src/modelconnector.h +funregistermail.o: ../../../../morm/src/clearer.h +funregistermail.o: ../../../../morm/src/dbconnector.h +funregistermail.o: ../../../../morm/src/queryresult.h +funregistermail.o: ../../../../morm/src/flatconnector.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 +funregistermail.o: ../../../../morm/src/finderhelper.h +funregistermail.o: ../../../../morm/src/fieldvaluehelper.h +funregistermail.o: ../../../../morm/src/flatexpression.h +funregistermail.o: ../../../../winix/winixd/models/itemcontent.h funregistermail.o: ../../../../winix/winixd/core/ugcontainer.h funregistermail.o: ../../../../winix/winixd/core/request.h funregistermail.o: ../../../../winix/winixd/core/error.h @@ -202,23 +218,7 @@ funregistermail.o: ../../../../winix/winixd/core/winixmodel.h funregistermail.o: ../../../../winix/winixd/core/plugin.h funregistermail.o: ../../../../winix/winixd/core/pluginmsg.h funregistermail.o: ../../../../winix/winixd/core/plugindata.h -funregistermail.o: ../../../../morm/src/morm.h -funregistermail.o: ../../../../morm/src/morm_types.h -funregistermail.o: ../../../../morm/src/model.h -funregistermail.o: ../../../../morm/src/modelconnector.h -funregistermail.o: ../../../../morm/src/clearer.h -funregistermail.o: ../../../../morm/src/dbconnector.h -funregistermail.o: ../../../../morm/src/queryresult.h -funregistermail.o: ../../../../morm/src/flatconnector.h -funregistermail.o: ../../../../morm/src/dbexpression.h -funregistermail.o: ../../../../morm/src/baseexpression.h -funregistermail.o: ../../../../morm/src/modelenv.h -funregistermail.o: ../../../../morm/src/modeldata.h -funregistermail.o: ../../../../morm/src/cursorhelper.h -funregistermail.o: ../../../../morm/src/finderhelper.h -funregistermail.o: ../../../../morm/src/fieldvaluehelper.h -funregistermail.o: ../../../../morm/src/flatexpression.h -funregistermail.o: ../../../../morm/src/finder.h +funregistermail.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h funregistermail.o: ../../../../morm/src/cursor.h funregistermail.o: ../../../../morm/src/jsonexpression.h funregistermail.o: ../../../../morm/src/postgresqlexpression.h @@ -254,7 +254,8 @@ funregistermail.o: ../../../../winix/winixd/templates/patterns.h funregistermail.o: ../../../../winix/winixd/templates/locale.h funregistermail.o: ../../../../winix/winixd/templates/localefilter.h funregistermail.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -funregistermail.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h +funregistermail.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +funregistermail.o: ../../../../ezc/src/cache.h funregistermail.o: ../../../../ezc/src/functions.h funregistermail.o: ../../../../ezc/src/funinfo.h funregistermail.o: ../../../../ezc/src/objects.h @@ -284,25 +285,28 @@ 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/winixbase.h mdb.h +init.o: ../../../../winix/winixd/core/winixbase.h +init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +init.o: ../../../../pikotools/date/date.h +init.o: ../../../../pikotools/convert/inttostr.h +init.o: ../../../../morm/src/dbconnector.h +init.o: ../../../../pikotools/textstream/textstream.h +init.o: ../../../../pikotools/space/space.h +init.o: ../../../../pikotools/textstream/types.h +init.o: ../../../../pikotools/membuffer/membuffer.h +init.o: ../../../../pikotools/textstream/types.h +init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h +init.o: ../../../../morm/src/queryresult.h +init.o: ../../../../morm/src/flatconnector.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/core/item.h -init.o: ../../../../pikotools/space/space.h -init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/date/date.h -init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../winix/winixd/db/db.h ../../../../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/item.h init.o: ../../../../winix/winixd/core/requesttypes.h -init.o: ../../../../pikotools/textstream/textstream.h -init.o: ../../../../pikotools/membuffer/membuffer.h -init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/utf8/utf8.h init.o: ../../../../winix/winixd/core/winix_const.h init.o: ../../../../pikotools/convert/convert.h @@ -316,7 +320,6 @@ init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../winix/winixd/core/log.h init.o: ../../../../winix/winixd/core/logmanipulators.h -init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h @@ -327,6 +330,15 @@ init.o: ../../../../winix/winixd/db/dbitemcolumns.h init.o: ../../../../winix/winixd/core/user.h init.o: ../../../../winix/winixd/core/group.h init.o: ../../../../winix/winixd/core/dircontainer.h +init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h +init.o: ../../../../morm/src/dbexpression.h +init.o: ../../../../morm/src/baseexpression.h +init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h +init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h +init.o: ../../../../morm/src/finderhelper.h +init.o: ../../../../morm/src/fieldvaluehelper.h +init.o: ../../../../morm/src/flatexpression.h +init.o: ../../../../winix/winixd/models/itemcontent.h init.o: ../../../../winix/winixd/core/ugcontainer.h init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/error.h @@ -340,17 +352,8 @@ init.o: ../../../../winix/winixd/core/job.h init.o: ../../../../winix/winixd/core/basethread.h init.o: ../../../../winix/winixd/core/winixmodel.h init.o: ../../../../winix/winixd/core/plugin.h ../../../../morm/src/morm.h -init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h -init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h -init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h -init.o: ../../../../morm/src/flatconnector.h -init.o: ../../../../morm/src/dbexpression.h -init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h -init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h -init.o: ../../../../morm/src/finderhelper.h -init.o: ../../../../morm/src/fieldvaluehelper.h -init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h -init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h +init.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +init.o: ../../../../morm/src/jsonexpression.h init.o: ../../../../morm/src/postgresqlexpression.h init.o: ../../../../morm/src/jsonconnector.h init.o: ../../../../morm/src/postgresqlconnector.h @@ -384,10 +387,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h init.o: ../../../../winix/winixd/templates/locale.h init.o: ../../../../winix/winixd/templates/localefilter.h init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -init.o: ../../../../ezc/src/expressionparser.h +init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h init.o: ../../../../ezc/src/patternparser.h init.o: ../../../../winix/winixd/notify/notifythread.h init.o: ../../../../winix/winixd/core/basethread.h @@ -458,9 +461,8 @@ mdb.o: ../../../../winix/winixd/core/log.h registermail_info.o: registermail_info.h templates.o: ../../../../winix/winixd/templates/templates.h templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -templates.o: ../../../../ezc/src/blocks.h -templates.o: ../../../../winix/winixd/core/item.h ../../../../ezc/src/cache.h -templates.o: ../../../../ezc/src/functions.h +templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h templates.o: ../../../../pikotools/utf8/utf8.h templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/space/space.h @@ -484,7 +486,6 @@ templates.o: ../../../../pikotools/convert/patternreplacer.h templates.o: ../../../../pikotools/convert/strtoint.h templates.o: ../../../../pikotools/convert/text.h templates.o: ../../../../winix/winixd/templates/patterncacher.h -templates.o: ../../../../winix/winixd/core/item.h templates.o: ../../../../winix/winixd/core/winixbase.h templates.o: ../../../../winix/winixd/core/config.h templates.o: ../../../../pikotools/space/spaceparser.h @@ -496,6 +497,22 @@ templates.o: ../../../../winix/winixd/core/synchro.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/models/item.h +templates.o: ../../../../morm/src/model.h +templates.o: ../../../../morm/src/modelconnector.h +templates.o: ../../../../morm/src/clearer.h +templates.o: ../../../../morm/src/dbconnector.h +templates.o: ../../../../morm/src/queryresult.h +templates.o: ../../../../morm/src/flatconnector.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 ../../../../morm/src/modeldata.h +templates.o: ../../../../morm/src/cursorhelper.h +templates.o: ../../../../morm/src/finderhelper.h +templates.o: ../../../../morm/src/fieldvaluehelper.h +templates.o: ../../../../morm/src/flatexpression.h +templates.o: ../../../../winix/winixd/models/itemcontent.h templates.o: ../../../../winix/winixd/templates/indexpatterns.h templates.o: ../../../../winix/winixd/templates/patterns.h templates.o: ../../../../winix/winixd/templates/locale.h @@ -512,21 +529,8 @@ 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/winixbase.h -templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -templates.o: ../../../../morm/src/model.h -templates.o: ../../../../morm/src/modelconnector.h -templates.o: ../../../../morm/src/clearer.h -templates.o: ../../../../morm/src/dbconnector.h -templates.o: ../../../../morm/src/queryresult.h -templates.o: ../../../../morm/src/flatconnector.h -templates.o: ../../../../morm/src/dbexpression.h -templates.o: ../../../../morm/src/baseexpression.h -templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h -templates.o: ../../../../morm/src/cursorhelper.h -templates.o: ../../../../morm/src/finderhelper.h -templates.o: ../../../../morm/src/fieldvaluehelper.h -templates.o: ../../../../morm/src/flatexpression.h -templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +templates.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +templates.o: ../../../../morm/src/cursor.h templates.o: ../../../../morm/src/jsonexpression.h templates.o: ../../../../morm/src/postgresqlexpression.h templates.o: ../../../../morm/src/jsonconnector.h diff --git a/winixd/plugins/mailregister/init.cpp b/winixd/plugins/mailregister/init.cpp index d69dea6..71366d8 100644 --- a/winixd/plugins/mailregister/init.cpp +++ b/winixd/plugins/mailregister/init.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2016-2018, Tomasz Sowa + * Copyright (c) 2016-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,7 +77,7 @@ void ReloadConfigFile(PluginInfo & info, Item & file) PT::SpaceParser parser; parser.SetSpace(space); - PT::SpaceParser::Status status = parser.ParseString(file.content); + PT::SpaceParser::Status status = parser.ParseString(file.item_content.content_raw); if( status == PT::SpaceParser::syntax_error ) { @@ -118,13 +118,23 @@ void ConfigReload(PluginInfo & info) if( dir ) { - DbItemQuery iq; +// DbItemQuery iq; std::vector items; +// +// iq.SetAll(true, false); +// iq.WhereParentId(dir->id); - iq.SetAll(true, false); - iq.WhereParentId(dir->id); + // CHECKME is it correct to get connector from the last item? + morm::ModelConnector * model_connector = info.cur->request->last_item->get_connector(); + morm::Finder finder(model_connector); - info.db->GetItems(items, iq); + finder. + select(). + where(). + eq(L"parent_id", dir->id). + get_vector(items); + + //info.db->GetItems(items, iq); for(Item & item : items) { diff --git a/winixd/plugins/mailregister/templates.cpp b/winixd/plugins/mailregister/templates.cpp index cf53034..7aefa63 100644 --- a/winixd/plugins/mailregister/templates.cpp +++ b/winixd/plugins/mailregister/templates.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2016, Tomasz Sowa + * Copyright (c) 2016-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,12 +34,12 @@ #include "templates/templates.h" #include "core/plugin.h" -#include "core/item.h" #include "core/log.h" #include "core/misc.h" #include "cache.h" #include "templates/miscspace.h" #include "registermail_info.h" +#include "models/item.h" namespace Winix diff --git a/winixd/plugins/menu/Makefile.dep b/winixd/plugins/menu/Makefile.dep index c3c6d57..30f9cf1 100644 --- a/winixd/plugins/menu/Makefile.dep +++ b/winixd/plugins/menu/Makefile.dep @@ -1,21 +1,19 @@ # DO NOT DELETE -cache.o: cache.h ../../../../winix/winixd/core/item.h -cache.o: ../../../../pikotools/space/space.h -cache.o: ../../../../pikotools/textstream/types.h -cache.o: ../../../../pikotools/date/date.h -cache.o: ../../../../pikotools/convert/inttostr.h -cache.o: ../../../../winix/winixd/core/dirs.h -cache.o: ../../../../winix/winixd/core/item.h +cache.o: cache.h ../../../../winix/winixd/core/dirs.h cache.o: ../../../../winix/winixd/core/dircontainer.h cache.o: ../../../../winix/winixd/core/winixbase.h cache.o: ../../../../winix/winixd/core/config.h cache.o: ../../../../pikotools/space/spaceparser.h cache.o: ../../../../pikotools/space/space.h +cache.o: ../../../../pikotools/textstream/types.h cache.o: ../../../../winix/winixd/core/log.h cache.o: ../../../../winix/winixd/core/logmanipulators.h cache.o: ../../../../pikotools/log/log.h cache.o: ../../../../pikotools/textstream/textstream.h +cache.o: ../../../../pikotools/space/space.h +cache.o: ../../../../pikotools/date/date.h +cache.o: ../../../../pikotools/convert/inttostr.h cache.o: ../../../../pikotools/membuffer/membuffer.h cache.o: ../../../../pikotools/textstream/types.h cache.o: ../../../../pikotools/log/filelog.h @@ -24,6 +22,19 @@ cache.o: ../../../../winix/winixd/core/synchro.h cache.o: ../../../../winix/winixd/core/filelog.h cache.o: ../../../../winix/winixd/core/lock.h cache.o: ../../../../winix/winixd/core/synchro.h +cache.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h +cache.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +cache.o: ../../../../morm/src/dbconnector.h +cache.o: ../../../../morm/src/queryresult.h +cache.o: ../../../../morm/src/flatconnector.h +cache.o: ../../../../morm/src/dbexpression.h +cache.o: ../../../../morm/src/baseexpression.h +cache.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h +cache.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h +cache.o: ../../../../morm/src/finderhelper.h +cache.o: ../../../../morm/src/fieldvaluehelper.h +cache.o: ../../../../morm/src/flatexpression.h +cache.o: ../../../../winix/winixd/models/itemcontent.h cache.o: ../../../../winix/winixd/db/db.h cache.o: ../../../../winix/winixd/db/dbbase.h cache.o: ../../../../winix/winixd/db/dbconn.h @@ -57,18 +68,7 @@ cache.o: ../../../../winix/winixd/core/winixmodel.h cache.o: ../../../../winix/winixd/core/plugin.h cache.o: ../../../../winix/winixd/core/pluginmsg.h cache.o: ../../../../winix/winixd/core/plugindata.h -cache.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -cache.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h -cache.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h -cache.o: ../../../../morm/src/queryresult.h -cache.o: ../../../../morm/src/flatconnector.h -cache.o: ../../../../morm/src/dbexpression.h -cache.o: ../../../../morm/src/baseexpression.h -cache.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h -cache.o: ../../../../morm/src/cursorhelper.h -cache.o: ../../../../morm/src/finderhelper.h -cache.o: ../../../../morm/src/fieldvaluehelper.h -cache.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h +cache.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h cache.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h cache.o: ../../../../morm/src/postgresqlexpression.h cache.o: ../../../../morm/src/jsonconnector.h @@ -83,13 +83,12 @@ init.o: ../../../../winix/winixd/core/winixbase.h init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../pikotools/space/spaceparser.h init.o: ../../../../pikotools/space/space.h +init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../winix/winixd/core/log.h init.o: ../../../../winix/winixd/core/logmanipulators.h init.o: ../../../../pikotools/log/log.h init.o: ../../../../pikotools/textstream/textstream.h -init.o: ../../../../pikotools/space/space.h -init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/date/date.h +init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../pikotools/membuffer/membuffer.h init.o: ../../../../pikotools/textstream/types.h @@ -97,11 +96,21 @@ init.o: ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/synchro.h init.o: ../../../../winix/winixd/core/filelog.h init.o: ../../../../winix/winixd/core/lock.h -init.o: ../../../../winix/winixd/core/synchro.h cache.h -init.o: ../../../../winix/winixd/core/item.h +init.o: ../../../../winix/winixd/core/synchro.h +init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h +init.o: ../../../../morm/src/flatconnector.h cache.h init.o: ../../../../winix/winixd/core/dirs.h -init.o: ../../../../winix/winixd/core/item.h init.o: ../../../../winix/winixd/core/dircontainer.h +init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h +init.o: ../../../../morm/src/dbexpression.h +init.o: ../../../../morm/src/baseexpression.h +init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h +init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h +init.o: ../../../../morm/src/finderhelper.h +init.o: ../../../../morm/src/fieldvaluehelper.h +init.o: ../../../../morm/src/flatexpression.h +init.o: ../../../../winix/winixd/models/itemcontent.h init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h init.o: ../../../../winix/winixd/db/dbconn.h init.o: ../../../../winix/winixd/db/dbtextstream.h @@ -132,26 +141,18 @@ init.o: ../../../../pikotools/space/spacetojson.h init.o: ../../../../ezc/src/outstreams.h init.o: ../../../../winix/winixd/core/winixmodel.h init.o: ../../../../winix/winixd/core/plugin.h ../../../../morm/src/morm.h -init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h -init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h -init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h -init.o: ../../../../morm/src/flatconnector.h -init.o: ../../../../morm/src/dbexpression.h -init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h -init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h -init.o: ../../../../morm/src/finderhelper.h -init.o: ../../../../morm/src/fieldvaluehelper.h -init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h -init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h +init.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +init.o: ../../../../morm/src/jsonexpression.h init.o: ../../../../morm/src/postgresqlexpression.h init.o: ../../../../morm/src/jsonconnector.h init.o: ../../../../morm/src/postgresqlconnector.h init.o: ../../../../morm/src/postgresqlqueryresult.h init.o: ../../../../winix/winixd/templates/templates.h init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/pattern.h -init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/expressionparser.h +init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/functions.h +init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +init.o: ../../../../ezc/src/expressionparser.h init.o: ../../../../ezc/src/patternparser.h init.o: ../../../../winix/winixd/templates/patterncacher.h init.o: ../../../../winix/winixd/templates/indexpatterns.h @@ -252,23 +253,21 @@ init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h templates.o: ../../../../winix/winixd/templates/templates.h templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -templates.o: ../../../../ezc/src/blocks.h -templates.o: ../../../../winix/winixd/core/item.h cache.h -templates.o: ../../../../winix/winixd/core/item.h -templates.o: ../../../../pikotools/space/space.h -templates.o: ../../../../pikotools/textstream/types.h -templates.o: ../../../../pikotools/date/date.h -templates.o: ../../../../pikotools/convert/inttostr.h +templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h cache.h templates.o: ../../../../winix/winixd/core/dirs.h templates.o: ../../../../winix/winixd/core/dircontainer.h templates.o: ../../../../winix/winixd/core/winixbase.h templates.o: ../../../../winix/winixd/core/config.h templates.o: ../../../../pikotools/space/spaceparser.h templates.o: ../../../../pikotools/space/space.h +templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../winix/winixd/core/log.h templates.o: ../../../../winix/winixd/core/logmanipulators.h templates.o: ../../../../pikotools/log/log.h templates.o: ../../../../pikotools/textstream/textstream.h +templates.o: ../../../../pikotools/space/space.h +templates.o: ../../../../pikotools/date/date.h +templates.o: ../../../../pikotools/convert/inttostr.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../pikotools/log/filelog.h @@ -277,6 +276,22 @@ templates.o: ../../../../winix/winixd/core/synchro.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/models/item.h +templates.o: ../../../../morm/src/model.h +templates.o: ../../../../morm/src/modelconnector.h +templates.o: ../../../../morm/src/clearer.h +templates.o: ../../../../morm/src/dbconnector.h +templates.o: ../../../../morm/src/queryresult.h +templates.o: ../../../../morm/src/flatconnector.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 ../../../../morm/src/modeldata.h +templates.o: ../../../../morm/src/cursorhelper.h +templates.o: ../../../../morm/src/finderhelper.h +templates.o: ../../../../morm/src/fieldvaluehelper.h +templates.o: ../../../../morm/src/flatexpression.h +templates.o: ../../../../winix/winixd/models/itemcontent.h templates.o: ../../../../winix/winixd/db/db.h templates.o: ../../../../winix/winixd/db/dbbase.h templates.o: ../../../../winix/winixd/db/dbconn.h @@ -310,21 +325,8 @@ templates.o: ../../../../winix/winixd/core/winixmodel.h templates.o: ../../../../winix/winixd/core/plugin.h templates.o: ../../../../winix/winixd/core/pluginmsg.h templates.o: ../../../../winix/winixd/core/plugindata.h -templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -templates.o: ../../../../morm/src/model.h -templates.o: ../../../../morm/src/modelconnector.h -templates.o: ../../../../morm/src/clearer.h -templates.o: ../../../../morm/src/dbconnector.h -templates.o: ../../../../morm/src/queryresult.h -templates.o: ../../../../morm/src/flatconnector.h -templates.o: ../../../../morm/src/dbexpression.h -templates.o: ../../../../morm/src/baseexpression.h -templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h -templates.o: ../../../../morm/src/cursorhelper.h -templates.o: ../../../../morm/src/finderhelper.h -templates.o: ../../../../morm/src/fieldvaluehelper.h -templates.o: ../../../../morm/src/flatexpression.h -templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +templates.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +templates.o: ../../../../morm/src/cursor.h templates.o: ../../../../morm/src/jsonexpression.h templates.o: ../../../../morm/src/postgresqlexpression.h templates.o: ../../../../morm/src/jsonconnector.h diff --git a/winixd/plugins/menu/cache.h b/winixd/plugins/menu/cache.h index 4343750..e157e6c 100644 --- a/winixd/plugins/menu/cache.h +++ b/winixd/plugins/menu/cache.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2012-2014, Tomasz Sowa + * Copyright (c) 2012-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,8 +38,9 @@ #include #include #include -#include "core/item.h" #include "core/dirs.h" +#include "models/item.h" + namespace Winix { diff --git a/winixd/plugins/menu/init.cpp b/winixd/plugins/menu/init.cpp index 49e8f82..509fb5f 100644 --- a/winixd/plugins/menu/init.cpp +++ b/winixd/plugins/menu/init.cpp @@ -151,15 +151,15 @@ using namespace Menu; // (not implemented yet) info.plugin->Assign(WINIX_FILE_REMOVED, InvalidateCacheByPointerParent); - info.plugin->Assign(WINIX_DIR_ADDED, InvalidateCacheByPointerParent); - info.plugin->Assign(WINIX_DIR_PREPARE_TO_REMOVE, InvalidateCacheByPointerParent); + info.plugin->Assign(WINIX_DIR_ADDED, InvalidateCacheByPointerParent); + info.plugin->Assign(WINIX_DIR_PREPARE_TO_REMOVE, InvalidateCacheByPointerParent); info.plugin->Assign(WINIX_DIR_REMOVED, InvalidateCacheById); - info.plugin->Assign(WINIX_FILE_ADDED, InvalidateCacheByPointerParent); + info.plugin->Assign(WINIX_FILE_ADDED, InvalidateCacheByPointerParent); info.plugin->Assign(WINIX_FILE_CHANGED, InvalidateCacheByPointerParent); info.plugin->Assign(WINIX_FILE_COPIED, InvalidateCacheByPointerParent); info.plugin->Assign(WINIX_FILE_PREPARE_TO_MOVE, InvalidateCacheByPointerParent); - info.plugin->Assign(WINIX_FILE_MOVED, InvalidateCacheByPointerParent); - info.plugin->Assign(WINIX_DIR_CONTENT_SORTED, InvalidateCacheByPointer); + info.plugin->Assign(WINIX_FILE_MOVED, InvalidateCacheByPointerParent); + info.plugin->Assign(WINIX_DIR_CONTENT_SORTED, InvalidateCacheByPointer); info.plugin->Assign(WINIX_PROCESS_REQUEST, ProcessRequest); // !! IMPROVE ME diff --git a/winixd/plugins/menu/templates.cpp b/winixd/plugins/menu/templates.cpp index 52e12af..c1cb44d 100644 --- a/winixd/plugins/menu/templates.cpp +++ b/winixd/plugins/menu/templates.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2016, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,11 +34,12 @@ #include "templates/templates.h" #include "core/plugin.h" -#include "core/item.h" #include "core/log.h" #include "core/misc.h" #include "cache.h" #include "templates/miscspace.h" +#include "models/item.h" + namespace Winix { @@ -61,11 +62,12 @@ extern int mount_par_menu_skip; extern Cache cache; static Ezc::Stack * stack = &empty_stack; -static DbItemQuery iq; +//static DbItemQuery iq; static std::vector item_tab; static MenuItem menu_item; + struct StackItem : public Ezc::FunData { CacheItem * citem; @@ -99,36 +101,53 @@ return WINIX_PL_MENU_PARAM_NONE; } - void read_from_db(long dir_id, int param, bool with_meta) { - iq.SetAll(false, false); - iq.sel_subject = true; - iq.sel_url = true; - iq.sel_sort_index = true; - iq.sort_date_asc = false; // !! FIXED ME we need an option for this - iq.sel_type = true; - iq.sel_file = true; - iq.sel_meta = with_meta; - iq.WhereParentId(dir_id); +// iq.SetAll(false, false); +// iq.sel_subject = true; +// iq.sel_url = true; +// iq.sel_sort_index = true; +// iq.sort_date_asc = false; // !! FIXED ME we need an option for this +// iq.sel_type = true; +// iq.sel_file = true; +// iq.sel_meta = with_meta; +// iq.WhereParentId(dir_id); + + // CHECKME is it correct to get the connector from last item? + morm::ModelConnector * model_connector = cur->request->last_item->get_connector(); + + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", dir_id); if( param == WINIX_PL_MENU_PARAM_IMAGES ) { - iq.WhereType(Item::file); - iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); +// iq.WhereType(Item::file); +// iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); + + finder. + eq(L"type", static_cast(Item::file)). + eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE); } else if( param == WINIX_PL_MENU_PARAM_DIRS ) { - iq.WhereType(Item::dir); + //iq.WhereType(Item::dir); + finder.eq(L"type", static_cast(Item::dir)); } else if( param == WINIX_PL_MENU_PARAM_FILES ) { - iq.WhereType(Item::file); + //iq.WhereType(Item::file); + finder.eq(L"type", static_cast(Item::file)); } - db->GetItems(item_tab, iq); + finder.get_vector(item_tab); + + //db->GetItems(item_tab, iq); log << log4 << "Menu: loaded directories/files from the database for parent_id: " << dir_id << logend; } @@ -190,9 +209,9 @@ void copy_items(CacheItem & citem) menu_item.id = item_tab[i].id; menu_item.subject = item_tab[i].subject; menu_item.url = item_tab[i].url; - menu_item.meta = item_tab[i].meta; + menu_item.meta = item_tab[i].item_content.meta; menu_item.type = item_tab[i].type; - menu_item.file_type = item_tab[i].file_type; + menu_item.file_type = item_tab[i].item_content.file_type; citem.menu_items.push_back(menu_item); } diff --git a/winixd/plugins/seo/Makefile.dep b/winixd/plugins/seo/Makefile.dep index eb8b395..eecd1e9 100644 --- a/winixd/plugins/seo/Makefile.dep +++ b/winixd/plugins/seo/Makefile.dep @@ -1,19 +1,17 @@ # DO NOT DELETE init.o: seo.h ../../../../winix/winixd/functions/functionbase.h -init.o: ../../../../winix/winixd/core/item.h -init.o: ../../../../pikotools/space/space.h -init.o: ../../../../pikotools/textstream/types.h -init.o: ../../../../pikotools/date/date.h -init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../winix/winixd/db/db.h ../../../../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/item.h init.o: ../../../../winix/winixd/core/requesttypes.h init.o: ../../../../pikotools/textstream/textstream.h +init.o: ../../../../pikotools/space/space.h +init.o: ../../../../pikotools/textstream/types.h +init.o: ../../../../pikotools/date/date.h +init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../pikotools/membuffer/membuffer.h init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/utf8/utf8.h @@ -42,6 +40,18 @@ init.o: ../../../../winix/winixd/core/user.h init.o: ../../../../winix/winixd/core/group.h init.o: ../../../../winix/winixd/core/dircontainer.h init.o: ../../../../winix/winixd/core/winixbase.h +init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h +init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h +init.o: ../../../../morm/src/flatconnector.h +init.o: ../../../../morm/src/dbexpression.h +init.o: ../../../../morm/src/baseexpression.h +init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h +init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h +init.o: ../../../../morm/src/finderhelper.h +init.o: ../../../../morm/src/fieldvaluehelper.h +init.o: ../../../../morm/src/flatexpression.h +init.o: ../../../../winix/winixd/models/itemcontent.h init.o: ../../../../winix/winixd/core/ugcontainer.h init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/error.h @@ -57,17 +67,7 @@ init.o: ../../../../winix/winixd/core/winixmodel.h init.o: ../../../../winix/winixd/core/plugin.h init.o: ../../../../winix/winixd/core/pluginmsg.h init.o: ../../../../winix/winixd/core/plugindata.h -init.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h -init.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h -init.o: ../../../../morm/src/queryresult.h -init.o: ../../../../morm/src/flatconnector.h -init.o: ../../../../morm/src/dbexpression.h -init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h -init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h -init.o: ../../../../morm/src/finderhelper.h -init.o: ../../../../morm/src/fieldvaluehelper.h -init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h +init.o: ../../../../morm/src/morm.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/jsonconnector.h @@ -102,10 +102,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h init.o: ../../../../winix/winixd/templates/locale.h init.o: ../../../../winix/winixd/templates/localefilter.h init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -init.o: ../../../../ezc/src/expressionparser.h +init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h init.o: ../../../../ezc/src/patternparser.h init.o: ../../../../winix/winixd/notify/notifythread.h init.o: ../../../../winix/winixd/core/basethread.h @@ -170,19 +170,17 @@ init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h init.o: ../../../../winix/winixd/core/htmlfilter.h seo.o: seo.h ../../../../winix/winixd/functions/functionbase.h -seo.o: ../../../../winix/winixd/core/item.h -seo.o: ../../../../pikotools/space/space.h -seo.o: ../../../../pikotools/textstream/types.h -seo.o: ../../../../pikotools/date/date.h -seo.o: ../../../../pikotools/convert/inttostr.h seo.o: ../../../../winix/winixd/db/db.h ../../../../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/item.h seo.o: ../../../../winix/winixd/core/requesttypes.h seo.o: ../../../../pikotools/textstream/textstream.h +seo.o: ../../../../pikotools/space/space.h +seo.o: ../../../../pikotools/textstream/types.h +seo.o: ../../../../pikotools/date/date.h +seo.o: ../../../../pikotools/convert/inttostr.h seo.o: ../../../../pikotools/membuffer/membuffer.h seo.o: ../../../../pikotools/textstream/types.h seo.o: ../../../../pikotools/utf8/utf8.h @@ -211,6 +209,18 @@ seo.o: ../../../../winix/winixd/core/user.h seo.o: ../../../../winix/winixd/core/group.h seo.o: ../../../../winix/winixd/core/dircontainer.h seo.o: ../../../../winix/winixd/core/winixbase.h +seo.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h +seo.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +seo.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h +seo.o: ../../../../morm/src/flatconnector.h +seo.o: ../../../../morm/src/dbexpression.h +seo.o: ../../../../morm/src/baseexpression.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/flatexpression.h +seo.o: ../../../../winix/winixd/models/itemcontent.h seo.o: ../../../../winix/winixd/core/ugcontainer.h seo.o: ../../../../winix/winixd/core/request.h seo.o: ../../../../winix/winixd/core/error.h @@ -226,17 +236,8 @@ seo.o: ../../../../winix/winixd/core/winixmodel.h seo.o: ../../../../winix/winixd/core/plugin.h seo.o: ../../../../winix/winixd/core/pluginmsg.h seo.o: ../../../../winix/winixd/core/plugindata.h ../../../../morm/src/morm.h -seo.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h -seo.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h -seo.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h -seo.o: ../../../../morm/src/flatconnector.h -seo.o: ../../../../morm/src/dbexpression.h -seo.o: ../../../../morm/src/baseexpression.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/flatexpression.h ../../../../morm/src/finder.h -seo.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h +seo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +seo.o: ../../../../morm/src/jsonexpression.h seo.o: ../../../../morm/src/postgresqlexpression.h seo.o: ../../../../morm/src/jsonconnector.h seo.o: ../../../../morm/src/postgresqlconnector.h @@ -270,10 +271,10 @@ seo.o: ../../../../winix/winixd/templates/patterns.h seo.o: ../../../../winix/winixd/templates/locale.h seo.o: ../../../../winix/winixd/templates/localefilter.h seo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -seo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -seo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -seo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -seo.o: ../../../../ezc/src/expressionparser.h +seo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +seo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +seo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +seo.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h seo.o: ../../../../ezc/src/patternparser.h seo.o: ../../../../winix/winixd/notify/notifythread.h seo.o: ../../../../winix/winixd/core/basethread.h diff --git a/winixd/plugins/seo/seo.cpp b/winixd/plugins/seo/seo.cpp index 5809b78..e74676d 100644 --- a/winixd/plugins/seo/seo.cpp +++ b/winixd/plugins/seo/seo.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2019, Tomasz Sowa + * Copyright (c) 2019-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,12 +77,13 @@ void Seo::MakePost() item.subject = subject; - PT::Space & seo = item.meta.FindAddSpace(L"seo"); + PT::Space & seo = item.item_content.meta.FindAddSpace(L"seo"); seo.Add(L"description", description); seo.Add(L"keywords", keywords); - db->EditSubjectById(item, item.id); - db->EditMetaById(item.meta, item.id); + item.update(false, true); + //db->EditSubjectById(item, item.id); + //db->EditMetaById(item.meta, item.id); if( item.type == Item::file ) plugin->Call(WINIX_FILE_CHANGED, &item); diff --git a/winixd/plugins/stats/Makefile.dep b/winixd/plugins/stats/Makefile.dep index 7ab86ed..349e9fa 100644 --- a/winixd/plugins/stats/Makefile.dep +++ b/winixd/plugins/stats/Makefile.dep @@ -14,7 +14,18 @@ init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/log/filelog.h init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/requesttypes.h -init.o: ../../../../winix/winixd/core/item.h +init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h +init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h +init.o: ../../../../morm/src/flatconnector.h +init.o: ../../../../morm/src/dbexpression.h +init.o: ../../../../morm/src/baseexpression.h +init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h +init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h +init.o: ../../../../morm/src/finderhelper.h +init.o: ../../../../morm/src/fieldvaluehelper.h +init.o: ../../../../morm/src/flatexpression.h +init.o: ../../../../winix/winixd/models/itemcontent.h init.o: ../../../../winix/winixd/core/error.h init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../pikotools/space/spaceparser.h @@ -44,7 +55,6 @@ 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/db/dbitemquery.h -init.o: ../../../../winix/winixd/core/item.h init.o: ../../../../winix/winixd/db/dbitemcolumns.h init.o: ../../../../winix/winixd/core/user.h init.o: ../../../../winix/winixd/core/group.h @@ -62,17 +72,8 @@ init.o: ../../../../winix/winixd/core/mount.h bot.h stats.h init.o: ../../../../winix/winixd/core/winixmodel.h init.o: ../../../../winix/winixd/core/plugin.h init.o: ../../../../winix/winixd/core/pluginmsg.h ../../../../morm/src/morm.h -init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h -init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h -init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h -init.o: ../../../../morm/src/flatconnector.h -init.o: ../../../../morm/src/dbexpression.h -init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h -init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h -init.o: ../../../../morm/src/finderhelper.h -init.o: ../../../../morm/src/fieldvaluehelper.h -init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h -init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h +init.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +init.o: ../../../../morm/src/jsonexpression.h init.o: ../../../../morm/src/postgresqlexpression.h init.o: ../../../../morm/src/jsonconnector.h init.o: ../../../../morm/src/postgresqlconnector.h @@ -101,11 +102,11 @@ stats.o: ../../../../winix/winixd/core/plugin.h stats.o: ../../../../winix/winixd/core/pluginmsg.h stats.o: ../../../../winix/winixd/core/plugindata.h stats.o: ../../../../winix/winixd/core/winixbase.h -stats.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -stats.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h -stats.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h +stats.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +stats.o: ../../../../morm/src/dbconnector.h stats.o: ../../../../morm/src/queryresult.h -stats.o: ../../../../morm/src/flatconnector.h +stats.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h +stats.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h stats.o: ../../../../morm/src/dbexpression.h stats.o: ../../../../morm/src/baseexpression.h stats.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h @@ -121,15 +122,14 @@ stats.o: ../../../../morm/src/postgresqlconnector.h stats.o: ../../../../morm/src/postgresqlqueryresult.h templates.o: templates.h ../../../../winix/winixd/core/plugin.h templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -templates.o: ../../../../ezc/src/blocks.h -templates.o: ../../../../winix/winixd/core/item.h +templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +templates.o: ../../../../pikotools/utf8/utf8.h +templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/space/space.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../pikotools/date/date.h templates.o: ../../../../pikotools/convert/inttostr.h -templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h -templates.o: ../../../../pikotools/utf8/utf8.h -templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h @@ -160,13 +160,12 @@ 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/winixbase.h -templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -templates.o: ../../../../morm/src/model.h templates.o: ../../../../morm/src/modelconnector.h templates.o: ../../../../morm/src/clearer.h templates.o: ../../../../morm/src/dbconnector.h templates.o: ../../../../morm/src/queryresult.h -templates.o: ../../../../morm/src/flatconnector.h +templates.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h +templates.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h templates.o: ../../../../morm/src/dbexpression.h templates.o: ../../../../morm/src/baseexpression.h templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h diff --git a/winixd/plugins/thread/Makefile.dep b/winixd/plugins/thread/Makefile.dep index def304d..85f7d20 100644 --- a/winixd/plugins/thread/Makefile.dep +++ b/winixd/plugins/thread/Makefile.dep @@ -2,20 +2,18 @@ createthread.o: createthread.h createthread.o: ../../../../winix/winixd/functions/functionbase.h -createthread.o: ../../../../winix/winixd/core/item.h -createthread.o: ../../../../pikotools/space/space.h -createthread.o: ../../../../pikotools/textstream/types.h -createthread.o: ../../../../pikotools/date/date.h -createthread.o: ../../../../pikotools/convert/inttostr.h createthread.o: ../../../../winix/winixd/db/db.h createthread.o: ../../../../winix/winixd/db/dbbase.h createthread.o: ../../../../winix/winixd/db/dbconn.h createthread.o: ../../../../winix/winixd/db/dbtextstream.h createthread.o: ../../../../winix/winixd/core/textstream.h createthread.o: ../../../../winix/winixd/core/misc.h -createthread.o: ../../../../winix/winixd/core/item.h createthread.o: ../../../../winix/winixd/core/requesttypes.h createthread.o: ../../../../pikotools/textstream/textstream.h +createthread.o: ../../../../pikotools/space/space.h +createthread.o: ../../../../pikotools/textstream/types.h +createthread.o: ../../../../pikotools/date/date.h +createthread.o: ../../../../pikotools/convert/inttostr.h createthread.o: ../../../../pikotools/membuffer/membuffer.h createthread.o: ../../../../pikotools/textstream/types.h createthread.o: ../../../../pikotools/utf8/utf8.h @@ -45,6 +43,23 @@ createthread.o: ../../../../winix/winixd/core/user.h createthread.o: ../../../../winix/winixd/core/group.h createthread.o: ../../../../winix/winixd/core/dircontainer.h createthread.o: ../../../../winix/winixd/core/winixbase.h +createthread.o: ../../../../winix/winixd/models/item.h +createthread.o: ../../../../morm/src/model.h +createthread.o: ../../../../morm/src/modelconnector.h +createthread.o: ../../../../morm/src/clearer.h +createthread.o: ../../../../morm/src/dbconnector.h +createthread.o: ../../../../morm/src/queryresult.h +createthread.o: ../../../../morm/src/flatconnector.h +createthread.o: ../../../../morm/src/dbexpression.h +createthread.o: ../../../../morm/src/baseexpression.h +createthread.o: ../../../../morm/src/morm_types.h +createthread.o: ../../../../morm/src/modelenv.h +createthread.o: ../../../../morm/src/modeldata.h +createthread.o: ../../../../morm/src/cursorhelper.h +createthread.o: ../../../../morm/src/finderhelper.h +createthread.o: ../../../../morm/src/fieldvaluehelper.h +createthread.o: ../../../../morm/src/flatexpression.h +createthread.o: ../../../../winix/winixd/models/itemcontent.h createthread.o: ../../../../winix/winixd/core/ugcontainer.h createthread.o: ../../../../winix/winixd/core/request.h createthread.o: ../../../../winix/winixd/core/error.h @@ -59,22 +74,8 @@ createthread.o: ../../../../winix/winixd/core/basethread.h createthread.o: ../../../../winix/winixd/core/winixmodel.h createthread.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h createthread.o: ../../../../winix/winixd/core/plugindata.h -createthread.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -createthread.o: ../../../../morm/src/model.h -createthread.o: ../../../../morm/src/modelconnector.h -createthread.o: ../../../../morm/src/clearer.h -createthread.o: ../../../../morm/src/dbconnector.h -createthread.o: ../../../../morm/src/queryresult.h -createthread.o: ../../../../morm/src/flatconnector.h -createthread.o: ../../../../morm/src/dbexpression.h -createthread.o: ../../../../morm/src/baseexpression.h -createthread.o: ../../../../morm/src/modelenv.h -createthread.o: ../../../../morm/src/modeldata.h -createthread.o: ../../../../morm/src/cursorhelper.h -createthread.o: ../../../../morm/src/finderhelper.h -createthread.o: ../../../../morm/src/fieldvaluehelper.h -createthread.o: ../../../../morm/src/flatexpression.h -createthread.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +createthread.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +createthread.o: ../../../../morm/src/cursor.h createthread.o: ../../../../morm/src/jsonexpression.h createthread.o: ../../../../morm/src/postgresqlexpression.h createthread.o: ../../../../morm/src/jsonconnector.h @@ -109,9 +110,10 @@ createthread.o: ../../../../winix/winixd/templates/patterns.h createthread.o: ../../../../winix/winixd/templates/locale.h createthread.o: ../../../../winix/winixd/templates/localefilter.h createthread.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -createthread.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -createthread.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -createthread.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +createthread.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +createthread.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +createthread.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +createthread.o: ../../../../ezc/src/pattern.h createthread.o: ../../../../ezc/src/expressionparser.h createthread.o: ../../../../ezc/src/patternparser.h createthread.o: ../../../../winix/winixd/notify/notifythread.h @@ -178,7 +180,6 @@ createthread.o: ../../../../winix/winixd/functions/who.h createthread.o: ../../../../winix/winixd/functions/vim.h createthread.o: ../../../../winix/winixd/core/htmlfilter.h funthread.o: ../../../../winix/winixd/core/misc.h -funthread.o: ../../../../winix/winixd/core/item.h funthread.o: ../../../../winix/winixd/core/requesttypes.h funthread.o: ../../../../pikotools/textstream/textstream.h funthread.o: ../../../../pikotools/space/space.h @@ -196,7 +197,6 @@ funthread.o: ../../../../pikotools/convert/strtoint.h funthread.o: ../../../../pikotools/convert/text.h funthread.o: ../../../../winix/winixd/core/misc.h funthread.h funthread.o: ../../../../winix/winixd/functions/functionbase.h -funthread.o: ../../../../winix/winixd/core/item.h funthread.o: ../../../../winix/winixd/db/db.h funthread.o: ../../../../winix/winixd/db/dbbase.h funthread.o: ../../../../winix/winixd/db/dbconn.h @@ -222,6 +222,22 @@ funthread.o: ../../../../winix/winixd/core/user.h funthread.o: ../../../../winix/winixd/core/group.h funthread.o: ../../../../winix/winixd/core/dircontainer.h funthread.o: ../../../../winix/winixd/core/winixbase.h +funthread.o: ../../../../winix/winixd/models/item.h +funthread.o: ../../../../morm/src/model.h +funthread.o: ../../../../morm/src/modelconnector.h +funthread.o: ../../../../morm/src/clearer.h +funthread.o: ../../../../morm/src/dbconnector.h +funthread.o: ../../../../morm/src/queryresult.h +funthread.o: ../../../../morm/src/flatconnector.h +funthread.o: ../../../../morm/src/dbexpression.h +funthread.o: ../../../../morm/src/baseexpression.h +funthread.o: ../../../../morm/src/morm_types.h +funthread.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h +funthread.o: ../../../../morm/src/cursorhelper.h +funthread.o: ../../../../morm/src/finderhelper.h +funthread.o: ../../../../morm/src/fieldvaluehelper.h +funthread.o: ../../../../morm/src/flatexpression.h +funthread.o: ../../../../winix/winixd/models/itemcontent.h funthread.o: ../../../../winix/winixd/core/ugcontainer.h funthread.o: ../../../../winix/winixd/core/request.h funthread.o: ../../../../winix/winixd/core/error.h @@ -236,21 +252,8 @@ funthread.o: ../../../../winix/winixd/core/basethread.h funthread.o: ../../../../winix/winixd/core/winixmodel.h funthread.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h funthread.o: ../../../../winix/winixd/core/plugindata.h -funthread.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -funthread.o: ../../../../morm/src/model.h -funthread.o: ../../../../morm/src/modelconnector.h -funthread.o: ../../../../morm/src/clearer.h -funthread.o: ../../../../morm/src/dbconnector.h -funthread.o: ../../../../morm/src/queryresult.h -funthread.o: ../../../../morm/src/flatconnector.h -funthread.o: ../../../../morm/src/dbexpression.h -funthread.o: ../../../../morm/src/baseexpression.h -funthread.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h -funthread.o: ../../../../morm/src/cursorhelper.h -funthread.o: ../../../../morm/src/finderhelper.h -funthread.o: ../../../../morm/src/fieldvaluehelper.h -funthread.o: ../../../../morm/src/flatexpression.h -funthread.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +funthread.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +funthread.o: ../../../../morm/src/cursor.h funthread.o: ../../../../morm/src/jsonexpression.h funthread.o: ../../../../morm/src/postgresqlexpression.h funthread.o: ../../../../morm/src/jsonconnector.h @@ -285,9 +288,10 @@ funthread.o: ../../../../winix/winixd/templates/patterns.h funthread.o: ../../../../winix/winixd/templates/locale.h funthread.o: ../../../../winix/winixd/templates/localefilter.h funthread.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -funthread.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -funthread.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -funthread.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +funthread.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +funthread.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +funthread.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +funthread.o: ../../../../ezc/src/pattern.h funthread.o: ../../../../ezc/src/expressionparser.h funthread.o: ../../../../ezc/src/patternparser.h funthread.o: ../../../../winix/winixd/notify/notifythread.h @@ -313,17 +317,15 @@ init.o: ../../../../pikotools/convert/inttostr.h init.o: ../../../../winix/winixd/db/dbbase.h init.o: ../../../../winix/winixd/core/error.h reply.h init.o: ../../../../winix/winixd/functions/functionbase.h -init.o: ../../../../winix/winixd/core/item.h -init.o: ../../../../pikotools/space/space.h -init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../winix/winixd/db/db.h ../../../../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/item.h init.o: ../../../../winix/winixd/core/requesttypes.h init.o: ../../../../pikotools/textstream/textstream.h +init.o: ../../../../pikotools/space/space.h +init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/membuffer/membuffer.h init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/utf8/utf8.h @@ -351,6 +353,18 @@ init.o: ../../../../winix/winixd/core/user.h init.o: ../../../../winix/winixd/core/group.h init.o: ../../../../winix/winixd/core/dircontainer.h init.o: ../../../../winix/winixd/core/winixbase.h +init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h +init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h +init.o: ../../../../morm/src/flatconnector.h +init.o: ../../../../morm/src/dbexpression.h +init.o: ../../../../morm/src/baseexpression.h +init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h +init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h +init.o: ../../../../morm/src/finderhelper.h +init.o: ../../../../morm/src/fieldvaluehelper.h +init.o: ../../../../morm/src/flatexpression.h +init.o: ../../../../winix/winixd/models/itemcontent.h init.o: ../../../../winix/winixd/core/ugcontainer.h init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/error.h @@ -365,17 +379,7 @@ init.o: ../../../../winix/winixd/core/basethread.h init.o: ../../../../winix/winixd/core/winixmodel.h init.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h init.o: ../../../../winix/winixd/core/plugindata.h -init.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h -init.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h -init.o: ../../../../morm/src/queryresult.h -init.o: ../../../../morm/src/flatconnector.h -init.o: ../../../../morm/src/dbexpression.h -init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h -init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h -init.o: ../../../../morm/src/finderhelper.h -init.o: ../../../../morm/src/fieldvaluehelper.h -init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h +init.o: ../../../../morm/src/morm.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/jsonconnector.h @@ -410,10 +414,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h init.o: ../../../../winix/winixd/templates/locale.h init.o: ../../../../winix/winixd/templates/localefilter.h init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -init.o: ../../../../ezc/src/expressionparser.h +init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h init.o: ../../../../ezc/src/patternparser.h init.o: ../../../../winix/winixd/notify/notifythread.h init.o: ../../../../winix/winixd/core/basethread.h @@ -480,20 +484,18 @@ init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h init.o: ../../../../winix/winixd/core/htmlfilter.h reply.o: reply.h ../../../../winix/winixd/functions/functionbase.h -reply.o: ../../../../winix/winixd/core/item.h -reply.o: ../../../../pikotools/space/space.h -reply.o: ../../../../pikotools/textstream/types.h -reply.o: ../../../../pikotools/date/date.h -reply.o: ../../../../pikotools/convert/inttostr.h reply.o: ../../../../winix/winixd/db/db.h reply.o: ../../../../winix/winixd/db/dbbase.h reply.o: ../../../../winix/winixd/db/dbconn.h reply.o: ../../../../winix/winixd/db/dbtextstream.h reply.o: ../../../../winix/winixd/core/textstream.h reply.o: ../../../../winix/winixd/core/misc.h -reply.o: ../../../../winix/winixd/core/item.h reply.o: ../../../../winix/winixd/core/requesttypes.h reply.o: ../../../../pikotools/textstream/textstream.h +reply.o: ../../../../pikotools/space/space.h +reply.o: ../../../../pikotools/textstream/types.h +reply.o: ../../../../pikotools/date/date.h +reply.o: ../../../../pikotools/convert/inttostr.h reply.o: ../../../../pikotools/membuffer/membuffer.h reply.o: ../../../../pikotools/textstream/types.h reply.o: ../../../../pikotools/utf8/utf8.h @@ -522,6 +524,19 @@ reply.o: ../../../../winix/winixd/core/user.h reply.o: ../../../../winix/winixd/core/group.h reply.o: ../../../../winix/winixd/core/dircontainer.h reply.o: ../../../../winix/winixd/core/winixbase.h +reply.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h +reply.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h +reply.o: ../../../../morm/src/dbconnector.h +reply.o: ../../../../morm/src/queryresult.h +reply.o: ../../../../morm/src/flatconnector.h +reply.o: ../../../../morm/src/dbexpression.h +reply.o: ../../../../morm/src/baseexpression.h +reply.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h +reply.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h +reply.o: ../../../../morm/src/finderhelper.h +reply.o: ../../../../morm/src/fieldvaluehelper.h +reply.o: ../../../../morm/src/flatexpression.h +reply.o: ../../../../winix/winixd/models/itemcontent.h reply.o: ../../../../winix/winixd/core/ugcontainer.h reply.o: ../../../../winix/winixd/core/request.h reply.o: ../../../../winix/winixd/core/error.h @@ -536,18 +551,7 @@ reply.o: ../../../../winix/winixd/core/basethread.h reply.o: ../../../../winix/winixd/core/winixmodel.h reply.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h reply.o: ../../../../winix/winixd/core/plugindata.h -reply.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -reply.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h -reply.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h -reply.o: ../../../../morm/src/queryresult.h -reply.o: ../../../../morm/src/flatconnector.h -reply.o: ../../../../morm/src/dbexpression.h -reply.o: ../../../../morm/src/baseexpression.h -reply.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h -reply.o: ../../../../morm/src/cursorhelper.h -reply.o: ../../../../morm/src/finderhelper.h -reply.o: ../../../../morm/src/fieldvaluehelper.h -reply.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h +reply.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h reply.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h reply.o: ../../../../morm/src/postgresqlexpression.h reply.o: ../../../../morm/src/jsonconnector.h @@ -582,10 +586,10 @@ reply.o: ../../../../winix/winixd/templates/patterns.h reply.o: ../../../../winix/winixd/templates/locale.h reply.o: ../../../../winix/winixd/templates/localefilter.h reply.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -reply.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -reply.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -reply.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -reply.o: ../../../../ezc/src/expressionparser.h +reply.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +reply.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +reply.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +reply.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h reply.o: ../../../../ezc/src/patternparser.h reply.o: ../../../../winix/winixd/notify/notifythread.h reply.o: ../../../../winix/winixd/core/basethread.h @@ -653,20 +657,18 @@ reply.o: ../../../../winix/winixd/core/htmlfilter.h reply.o: ../../../../winix/winixd/core/misc.h showthreads.o: showthreads.h showthreads.o: ../../../../winix/winixd/functions/functionbase.h -showthreads.o: ../../../../winix/winixd/core/item.h -showthreads.o: ../../../../pikotools/space/space.h -showthreads.o: ../../../../pikotools/textstream/types.h -showthreads.o: ../../../../pikotools/date/date.h -showthreads.o: ../../../../pikotools/convert/inttostr.h showthreads.o: ../../../../winix/winixd/db/db.h showthreads.o: ../../../../winix/winixd/db/dbbase.h showthreads.o: ../../../../winix/winixd/db/dbconn.h showthreads.o: ../../../../winix/winixd/db/dbtextstream.h showthreads.o: ../../../../winix/winixd/core/textstream.h showthreads.o: ../../../../winix/winixd/core/misc.h -showthreads.o: ../../../../winix/winixd/core/item.h showthreads.o: ../../../../winix/winixd/core/requesttypes.h showthreads.o: ../../../../pikotools/textstream/textstream.h +showthreads.o: ../../../../pikotools/space/space.h +showthreads.o: ../../../../pikotools/textstream/types.h +showthreads.o: ../../../../pikotools/date/date.h +showthreads.o: ../../../../pikotools/convert/inttostr.h showthreads.o: ../../../../pikotools/membuffer/membuffer.h showthreads.o: ../../../../pikotools/textstream/types.h showthreads.o: ../../../../pikotools/utf8/utf8.h @@ -696,6 +698,23 @@ showthreads.o: ../../../../winix/winixd/core/user.h showthreads.o: ../../../../winix/winixd/core/group.h showthreads.o: ../../../../winix/winixd/core/dircontainer.h showthreads.o: ../../../../winix/winixd/core/winixbase.h +showthreads.o: ../../../../winix/winixd/models/item.h +showthreads.o: ../../../../morm/src/model.h +showthreads.o: ../../../../morm/src/modelconnector.h +showthreads.o: ../../../../morm/src/clearer.h +showthreads.o: ../../../../morm/src/dbconnector.h +showthreads.o: ../../../../morm/src/queryresult.h +showthreads.o: ../../../../morm/src/flatconnector.h +showthreads.o: ../../../../morm/src/dbexpression.h +showthreads.o: ../../../../morm/src/baseexpression.h +showthreads.o: ../../../../morm/src/morm_types.h +showthreads.o: ../../../../morm/src/modelenv.h +showthreads.o: ../../../../morm/src/modeldata.h +showthreads.o: ../../../../morm/src/cursorhelper.h +showthreads.o: ../../../../morm/src/finderhelper.h +showthreads.o: ../../../../morm/src/fieldvaluehelper.h +showthreads.o: ../../../../morm/src/flatexpression.h +showthreads.o: ../../../../winix/winixd/models/itemcontent.h showthreads.o: ../../../../winix/winixd/core/ugcontainer.h showthreads.o: ../../../../winix/winixd/core/request.h showthreads.o: ../../../../winix/winixd/core/error.h @@ -710,22 +729,8 @@ showthreads.o: ../../../../winix/winixd/core/basethread.h showthreads.o: ../../../../winix/winixd/core/winixmodel.h showthreads.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h showthreads.o: ../../../../winix/winixd/core/plugindata.h -showthreads.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -showthreads.o: ../../../../morm/src/model.h -showthreads.o: ../../../../morm/src/modelconnector.h -showthreads.o: ../../../../morm/src/clearer.h -showthreads.o: ../../../../morm/src/dbconnector.h -showthreads.o: ../../../../morm/src/queryresult.h -showthreads.o: ../../../../morm/src/flatconnector.h -showthreads.o: ../../../../morm/src/dbexpression.h -showthreads.o: ../../../../morm/src/baseexpression.h -showthreads.o: ../../../../morm/src/modelenv.h -showthreads.o: ../../../../morm/src/modeldata.h -showthreads.o: ../../../../morm/src/cursorhelper.h -showthreads.o: ../../../../morm/src/finderhelper.h -showthreads.o: ../../../../morm/src/fieldvaluehelper.h -showthreads.o: ../../../../morm/src/flatexpression.h -showthreads.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +showthreads.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +showthreads.o: ../../../../morm/src/cursor.h showthreads.o: ../../../../morm/src/jsonexpression.h showthreads.o: ../../../../morm/src/postgresqlexpression.h showthreads.o: ../../../../morm/src/jsonconnector.h @@ -760,9 +765,10 @@ showthreads.o: ../../../../winix/winixd/templates/patterns.h showthreads.o: ../../../../winix/winixd/templates/locale.h showthreads.o: ../../../../winix/winixd/templates/localefilter.h showthreads.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -showthreads.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -showthreads.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -showthreads.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +showthreads.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +showthreads.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +showthreads.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +showthreads.o: ../../../../ezc/src/pattern.h showthreads.o: ../../../../ezc/src/expressionparser.h showthreads.o: ../../../../ezc/src/patternparser.h showthreads.o: ../../../../winix/winixd/notify/notifythread.h @@ -788,12 +794,7 @@ tdb.o: ../../../../pikotools/convert/inttostr.h tdb.o: ../../../../winix/winixd/db/dbbase.h tdb.o: ../../../../winix/winixd/core/error.h tdb.o: ../../../../winix/winixd/core/log.h -templates.o: threadinfo.h ../../../../winix/winixd/core/item.h -templates.o: ../../../../pikotools/space/space.h -templates.o: ../../../../pikotools/textstream/types.h -templates.o: ../../../../pikotools/date/date.h -templates.o: ../../../../pikotools/convert/inttostr.h -templates.o: ../../../../winix/winixd/core/system.h +templates.o: threadinfo.h ../../../../winix/winixd/core/system.h templates.o: ../../../../winix/winixd/core/job.h templates.o: ../../../../winix/winixd/core/basethread.h templates.o: ../../../../winix/winixd/core/synchro.h @@ -806,6 +807,10 @@ templates.o: ../../../../winix/winixd/core/log.h templates.o: ../../../../winix/winixd/core/logmanipulators.h templates.o: ../../../../pikotools/log/log.h templates.o: ../../../../pikotools/textstream/textstream.h +templates.o: ../../../../pikotools/space/space.h +templates.o: ../../../../pikotools/textstream/types.h +templates.o: ../../../../pikotools/date/date.h +templates.o: ../../../../pikotools/convert/inttostr.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../pikotools/log/filelog.h @@ -816,13 +821,12 @@ templates.o: ../../../../winix/winixd/core/lock.h templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h templates.o: ../../../../winix/winixd/core/plugindata.h templates.o: ../../../../winix/winixd/core/winixbase.h -templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -templates.o: ../../../../morm/src/model.h templates.o: ../../../../morm/src/modelconnector.h templates.o: ../../../../morm/src/clearer.h templates.o: ../../../../morm/src/dbconnector.h templates.o: ../../../../morm/src/queryresult.h -templates.o: ../../../../morm/src/flatconnector.h +templates.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h +templates.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h templates.o: ../../../../morm/src/dbexpression.h templates.o: ../../../../morm/src/baseexpression.h templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h @@ -838,7 +842,6 @@ templates.o: ../../../../morm/src/jsonconnector.h templates.o: ../../../../morm/src/postgresqlconnector.h templates.o: ../../../../morm/src/postgresqlqueryresult.h templates.o: ../../../../winix/winixd/core/dirs.h -templates.o: ../../../../winix/winixd/core/item.h templates.o: ../../../../winix/winixd/core/dircontainer.h templates.o: ../../../../winix/winixd/db/db.h templates.o: ../../../../winix/winixd/db/dbbase.h @@ -859,6 +862,8 @@ templates.o: ../../../../winix/winixd/db/dbitemcolumns.h templates.o: ../../../../winix/winixd/core/user.h templates.o: ../../../../winix/winixd/core/group.h templates.o: ../../../../winix/winixd/core/dircontainer.h +templates.o: ../../../../winix/winixd/models/item.h +templates.o: ../../../../winix/winixd/models/itemcontent.h templates.o: ../../../../winix/winixd/core/ugcontainer.h templates.o: ../../../../winix/winixd/core/request.h templates.o: ../../../../winix/winixd/core/mounts.h @@ -890,10 +895,10 @@ templates.o: ../../../../winix/winixd/templates/patterns.h templates.o: ../../../../winix/winixd/templates/locale.h templates.o: ../../../../winix/winixd/templates/localefilter.h templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -templates.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -templates.o: ../../../../ezc/src/outstreams.h +templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +templates.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h templates.o: ../../../../ezc/src/expressionparser.h templates.o: ../../../../ezc/src/patternparser.h templates.o: ../../../../winix/winixd/notify/notifythread.h @@ -971,12 +976,7 @@ templates.o: ../../../../winix/winixd/functions/upload.h templates.o: ../../../../winix/winixd/functions/uptime.h templates.o: ../../../../winix/winixd/functions/who.h templates.o: ../../../../winix/winixd/functions/vim.h -threadinfo.o: threadinfo.h ../../../../winix/winixd/core/item.h -threadinfo.o: ../../../../pikotools/space/space.h -threadinfo.o: ../../../../pikotools/textstream/types.h -threadinfo.o: ../../../../pikotools/date/date.h -threadinfo.o: ../../../../pikotools/convert/inttostr.h -threadinfo.o: ../../../../winix/winixd/core/system.h +threadinfo.o: threadinfo.h ../../../../winix/winixd/core/system.h threadinfo.o: ../../../../winix/winixd/core/job.h threadinfo.o: ../../../../winix/winixd/core/basethread.h threadinfo.o: ../../../../winix/winixd/core/synchro.h @@ -989,6 +989,10 @@ threadinfo.o: ../../../../winix/winixd/core/log.h threadinfo.o: ../../../../winix/winixd/core/logmanipulators.h threadinfo.o: ../../../../pikotools/log/log.h threadinfo.o: ../../../../pikotools/textstream/textstream.h +threadinfo.o: ../../../../pikotools/space/space.h +threadinfo.o: ../../../../pikotools/textstream/types.h +threadinfo.o: ../../../../pikotools/date/date.h +threadinfo.o: ../../../../pikotools/convert/inttostr.h threadinfo.o: ../../../../pikotools/membuffer/membuffer.h threadinfo.o: ../../../../pikotools/textstream/types.h threadinfo.o: ../../../../pikotools/log/filelog.h @@ -999,13 +1003,13 @@ threadinfo.o: ../../../../winix/winixd/core/lock.h threadinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h threadinfo.o: ../../../../winix/winixd/core/plugindata.h threadinfo.o: ../../../../winix/winixd/core/winixbase.h -threadinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -threadinfo.o: ../../../../morm/src/model.h threadinfo.o: ../../../../morm/src/modelconnector.h threadinfo.o: ../../../../morm/src/clearer.h threadinfo.o: ../../../../morm/src/dbconnector.h threadinfo.o: ../../../../morm/src/queryresult.h threadinfo.o: ../../../../morm/src/flatconnector.h +threadinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h +threadinfo.o: ../../../../morm/src/model.h threadinfo.o: ../../../../morm/src/dbexpression.h threadinfo.o: ../../../../morm/src/baseexpression.h threadinfo.o: ../../../../morm/src/modelenv.h @@ -1022,7 +1026,6 @@ threadinfo.o: ../../../../morm/src/jsonconnector.h threadinfo.o: ../../../../morm/src/postgresqlconnector.h threadinfo.o: ../../../../morm/src/postgresqlqueryresult.h threadinfo.o: ../../../../winix/winixd/core/dirs.h -threadinfo.o: ../../../../winix/winixd/core/item.h threadinfo.o: ../../../../winix/winixd/core/dircontainer.h threadinfo.o: ../../../../winix/winixd/db/db.h threadinfo.o: ../../../../winix/winixd/db/dbbase.h @@ -1043,6 +1046,8 @@ threadinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h threadinfo.o: ../../../../winix/winixd/core/user.h threadinfo.o: ../../../../winix/winixd/core/group.h threadinfo.o: ../../../../winix/winixd/core/dircontainer.h +threadinfo.o: ../../../../winix/winixd/models/item.h +threadinfo.o: ../../../../winix/winixd/models/itemcontent.h threadinfo.o: ../../../../winix/winixd/core/ugcontainer.h threadinfo.o: ../../../../winix/winixd/core/request.h threadinfo.o: ../../../../winix/winixd/core/mounts.h @@ -1074,10 +1079,10 @@ threadinfo.o: ../../../../winix/winixd/templates/patterns.h threadinfo.o: ../../../../winix/winixd/templates/locale.h threadinfo.o: ../../../../winix/winixd/templates/localefilter.h threadinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -threadinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -threadinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -threadinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -threadinfo.o: ../../../../ezc/src/outstreams.h +threadinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +threadinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +threadinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +threadinfo.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h threadinfo.o: ../../../../ezc/src/expressionparser.h threadinfo.o: ../../../../ezc/src/patternparser.h threadinfo.o: ../../../../winix/winixd/notify/notifythread.h diff --git a/winixd/plugins/thread/createthread.cpp b/winixd/plugins/thread/createthread.cpp index 3985cc8..376f3ab 100644 --- a/winixd/plugins/thread/createthread.cpp +++ b/winixd/plugins/thread/createthread.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -100,7 +100,7 @@ void CreateThread::MakePost() functions->SetUser(cur->request->item); functions->PrepareUrl(cur->request->item); cur->request->item.parent_id = cur->request->dir_tab.back()->id; - cur->request->item.privileges = system->NewFilePrivileges(); + cur->request->item.item_content.privileges = system->NewFilePrivileges(); if( functions->CheckAbuse() ) return; diff --git a/winixd/plugins/thread/funthread.cpp b/winixd/plugins/thread/funthread.cpp index 1602631..41e7df5 100644 --- a/winixd/plugins/thread/funthread.cpp +++ b/winixd/plugins/thread/funthread.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -83,16 +83,31 @@ void FunThread::PrepareThread(long file_id) if( !id_tab.empty() ) { - DbItemQuery iq; +// DbItemQuery iq; +// +// if( system->mounts.pmount->IsArg(thread_info->mount_par_thread, L"sort_desc") ) +// iq.sort_date_asc = false; // sort_index_asc we are ignoring +// +// iq.WhereIdIn(id_tab); +// iq.WhereType(Item::file); +// iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE); + + morm::Finder finder(model_connector); + + thread_info->item_tab = finder. + select(). + where(). + in(L"id", id_tab). + eq(L"type", static_cast(Item::file)). + eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE). + get_vector(); if( system->mounts.pmount->IsArg(thread_info->mount_par_thread, L"sort_desc") ) - iq.sort_date_asc = false; // sort_index_asc we are ignoring + finder.raw("order by content.date_creation desc"); + else + finder.raw("order by content.date_creation asc"); - iq.WhereIdIn(id_tab); - iq.WhereType(Item::file); - iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE); - - db->GetItems(thread_info->item_tab, iq); + //db->GetItems(thread_info->item_tab, iq); system->CheckAccessToItems(thread_info->item_tab); thread_info->item_sort_tab.resize(thread_info->item_tab.size()); diff --git a/winixd/plugins/thread/reply.cpp b/winixd/plugins/thread/reply.cpp index 9776e79..65ae50e 100644 --- a/winixd/plugins/thread/reply.cpp +++ b/winixd/plugins/thread/reply.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -80,7 +80,7 @@ bool Reply::HasAccess() return false; - PT::Space * thread_space = cur->request->item.ameta.FindSpace(L"thread"); + PT::Space * thread_space = cur->request->item.item_content.meta_admin.FindSpace(L"thread"); if( thread_space ) { @@ -128,7 +128,7 @@ void Reply::MakePost() functions->SetUser(answer); functions->PrepareUrl(answer); answer.parent_id = files_dir->id; - answer.privileges = system->NewFilePrivileges(); + answer.item_content.privileges = system->NewFilePrivileges(); if( functions->CheckAbuse() ) return; diff --git a/winixd/plugins/thread/showthreads.cpp b/winixd/plugins/thread/showthreads.cpp index cdfb82f..0e5d473 100644 --- a/winixd/plugins/thread/showthreads.cpp +++ b/winixd/plugins/thread/showthreads.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -89,7 +89,7 @@ bool ShowThreads::Sort::operator()(const Item * item1, const Item * item2) else { // sorting by date - return item1->date_creation > item2->date_creation; + return item1->item_content.date_creation > item2->item_content.date_creation; } } @@ -99,21 +99,31 @@ bool ShowThreads::Sort::operator()(const Item * item1, const Item * item2) void ShowThreads::ReadFiles() { // reading files - DbItemQuery iq; - iq.SetAll(false, false); - iq.sel_url = true; - iq.sel_subject = true; - iq.sel_date = true; - iq.sel_user_id = true; - iq.sel_group_id = true; - iq.sel_guest_name = true; - iq.sel_privileges = true; - iq.sel_date = true; - iq.WhereParentId(cur->request->dir_tab.back()->id); - iq.WhereType(Item::file); - iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE); +// DbItemQuery iq; +// iq.SetAll(false, false); +// iq.sel_url = true; +// iq.sel_subject = true; +// iq.sel_date = true; +// iq.sel_user_id = true; +// iq.sel_group_id = true; +// iq.sel_guest_name = true; +// iq.sel_privileges = true; +// iq.sel_date = true; +// iq.WhereParentId(cur->request->dir_tab.back()->id); +// iq.WhereType(Item::file); +// iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE); - db->GetItems(thread_info->item_tab, iq); + morm::Finder finder(model_connector); + + thread_info->item_tab = finder. + select(). + where(). + eq(L"parent_id", cur->request->dir_tab.back()->id). + eq(L"type", static_cast(Item::file)). + eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE). + get_vector(); + + //db->GetItems(thread_info->item_tab, iq); system->CheckAccessToItems(thread_info->item_tab); } diff --git a/winixd/plugins/thread/templates.cpp b/winixd/plugins/thread/templates.cpp index 4580de0..127168a 100644 --- a/winixd/plugins/thread/templates.cpp +++ b/winixd/plugins/thread/templates.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -164,14 +164,14 @@ void thread_sort_tab_subject_noescape(Info & i) void thread_sort_tab_content(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) - i.out << thread_info.item_sort_tab[item_sort_index]->content; + i.out << thread_info.item_sort_tab[item_sort_index]->item_content.content_raw; } void thread_sort_tab_content_noescape(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) - i.out << R(thread_info.item_sort_tab[item_sort_index]->content); + i.out << R(thread_info.item_sort_tab[item_sort_index]->item_content.content_raw); } @@ -180,8 +180,8 @@ void thread_sort_tab_print_content(Info & i) if( item_sort_index >= thread_info.item_sort_tab.size() ) return; - std::wstring & content = thread_info.item_sort_tab[item_sort_index]->content; - Item::ContentType type = thread_info.item_sort_tab[item_sort_index]->content_type; + std::wstring & content = thread_info.item_sort_tab[item_sort_index]->item_content.content_raw; + ItemContent::ContentType type = thread_info.item_sort_tab[item_sort_index]->item_content.content_raw_type; item_print_content(i.out, content, type); } @@ -190,7 +190,7 @@ void thread_sort_tab_print_content(Info & i) void thread_sort_tab_privileges(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) - i.out << "0" << Toa(thread_info.item_sort_tab[item_sort_index]->privileges, 8); + i.out << "0" << Toa(thread_info.item_sort_tab[item_sort_index]->item_content.privileges, 8); } @@ -251,8 +251,8 @@ void thread_sort_tab_user(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->user_id); - print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->guest_name); + User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->item_content.user_id); + print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->item_content.guest_name); } } @@ -262,8 +262,8 @@ void thread_sort_tab_modification_user(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->modification_user_id); - print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->guest_name); + User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->item_content.modification_user_id); + print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->item_content.guest_name); } } @@ -273,7 +273,7 @@ void thread_sort_tab_users_different(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - i.res = (thread_info.item_sort_tab[item_sort_index]->user_id != thread_info.item_sort_tab[item_sort_index]->modification_user_id); + i.res = (thread_info.item_sort_tab[item_sort_index]->item_content.user_id != thread_info.item_sort_tab[item_sort_index]->item_content.modification_user_id); } } @@ -283,7 +283,7 @@ void thread_sort_tab_group(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - long group_id = thread_info.item_sort_tab[item_sort_index]->group_id; + long group_id = thread_info.item_sort_tab[item_sort_index]->item_content.group_id; Group * pgroup = system->groups.GetGroup(group_id); if( pgroup ) @@ -298,7 +298,7 @@ void thread_sort_tab_date_creation(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - PT::Date date = system->ToLocal(thread_info.item_sort_tab[item_sort_index]->date_creation); + PT::Date date = system->ToLocal(thread_info.item_sort_tab[item_sort_index]->item_content.date_creation); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } } @@ -308,7 +308,7 @@ void thread_sort_tab_date_modification(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - PT::Date date = system->ToLocal(thread_info.item_sort_tab[item_sort_index]->date_modification); + PT::Date date = system->ToLocal(thread_info.item_sort_tab[item_sort_index]->item_content.date_modification); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } } @@ -318,7 +318,7 @@ void thread_sort_tab_date_creation_nice(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->date_creation); + print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->item_content.date_creation); } } @@ -328,7 +328,7 @@ void thread_sort_tab_date_modification_nice(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->date_modification); + print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->item_content.date_modification); } } @@ -337,8 +337,8 @@ void thread_sort_tab_dates_equal(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - PT::Date & date1 = thread_info.item_sort_tab[item_sort_index]->date_creation; - PT::Date & date2 = thread_info.item_sort_tab[item_sort_index]->date_modification; + PT::Date & date1 = thread_info.item_sort_tab[item_sort_index]->item_content.date_creation; + PT::Date & date2 = thread_info.item_sort_tab[item_sort_index]->item_content.date_modification; i.res = date1 == date2; } @@ -358,7 +358,7 @@ void thread_sort_tab_run(Info & i) ezc_generator.SetPattern(*p); ezc_generator.Generate(item_run_content); - item_print_content(i.out, item_run_content.Str(), thread_info.item_sort_tab[item_sort_index]->content_type); + item_print_content(i.out, item_run_content.Str(), thread_info.item_sort_tab[item_sort_index]->item_content.content_raw_type); } else { @@ -373,8 +373,8 @@ void thread_sort_tab_has_static_file(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) { - i.res = thread_info.item_sort_tab[item_sort_index]->file_type != WINIX_ITEM_FILETYPE_NONE && - !thread_info.item_sort_tab[item_sort_index]->file_path.empty(); + i.res = thread_info.item_sort_tab[item_sort_index]->item_content.file_type != WINIX_ITEM_FILETYPE_NONE && + !thread_info.item_sort_tab[item_sort_index]->item_content.file_path.empty(); } } @@ -382,7 +382,7 @@ void thread_sort_tab_has_static_file(Info & i) void thread_sort_tab_has_thumb(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) - i.res = thread_info.item_sort_tab[item_sort_index]->has_thumb; + i.res = thread_info.item_sort_tab[item_sort_index]->item_content.file_has_thumb; } @@ -410,21 +410,21 @@ void thread_sort_tab_type_is_symlink(Info & i) void thread_sort_tab_is_link_to(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) - i.res = !thread_info.item_sort_tab[item_sort_index]->link_to.empty(); + i.res = !thread_info.item_sort_tab[item_sort_index]->item_content.link_to.empty(); } void thread_sort_tab_link_to(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) - i.out << thread_info.item_sort_tab[item_sort_index]->link_to; + i.out << thread_info.item_sort_tab[item_sort_index]->item_content.link_to; } void thread_sort_tab_is_link_redirect(Info & i) { if( item_sort_index < thread_info.item_sort_tab.size() ) - i.res = thread_info.item_sort_tab[item_sort_index]->link_redirect == 1; + i.res = thread_info.item_sort_tab[item_sort_index]->item_content.link_redirect == 1; } @@ -455,7 +455,7 @@ void thread_sort_tab_last_item_date_modification_nice(Info & i) if( thread.last_item_id != -1 ) print_date_nice(i, thread.last_item_date_modification); else - print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->date_modification); + print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->item_content.date_modification); } } } @@ -476,8 +476,8 @@ void thread_sort_tab_last_item_user(Info & i) } else { - User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->user_id); - print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->guest_name); + User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->item_content.user_id); + print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->item_content.guest_name); } } } diff --git a/winixd/plugins/thread/threadinfo.cpp b/winixd/plugins/thread/threadinfo.cpp index 816a0a9..48ffa97 100644 --- a/winixd/plugins/thread/threadinfo.cpp +++ b/winixd/plugins/thread/threadinfo.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -99,7 +99,13 @@ void ThreadInfo::RemoveThread(long file_id) if( tdb->GetAnswers(file_id, remove_answer_id_tab) == WINIX_ERR_OK ) { for(size_t i=0 ; iDelFileById(remove_answer_id_tab[i]); + { + 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]); + } } tdb->RemoveThread(file_id); @@ -116,12 +122,22 @@ void ThreadInfo::RemoveThreadAnswer(long answer_id) void ThreadInfo::RepairAnswer(long answer_id) { - iq.Clear(); - iq.SetAll(false, false); - iq.WhereId(answer_id); - iq.WhereType(Item::file); // !! moze w przyszlosci pozwolic takze na symlinki? +// iq.Clear(); +// iq.SetAll(false, false); +// iq.WhereId(answer_id); +// iq.WhereType(Item::file); // !! moze w przyszlosci pozwolic takze na symlinki? - if( db->GetItem(repair_item, iq) == WINIX_ERR_NO_ITEM ) + morm::Finder finder(model_connector); + + repair_item = finder. + select(). + where(). + eq(L"id", answer_id). + eq(L"type", static_cast(Item::file)). + get(); + + //if( db->GetItem(repair_item, iq) == WINIX_ERR_NO_ITEM ) + if( !repair_item.found() ) { log << log3 << "ThreadInfo: there is no a file for thread answer_id: " << answer_id << logend; tdb->RemoveAnswerOnly(answer_id); @@ -141,12 +157,21 @@ void ThreadInfo::RepairAnswers(long file_id) void ThreadInfo::Repair(long file_id) { - iq.Clear(); - iq.SetAll(false, false); - iq.WhereId(file_id); - iq.WhereType(Item::file); // !! moze w przyszlosci pozwolic takze na symlinki? +// iq.Clear(); +// iq.SetAll(false, false); +// iq.WhereId(file_id); +// iq.WhereType(Item::file); // !! moze w przyszlosci pozwolic takze na symlinki? - if( db->GetItem(repair_item, iq) == WINIX_ERR_NO_ITEM ) + morm::Finder finder(model_connector); + + repair_item = finder. + select(). + where(). + eq(L"id", file_id). + eq(L"type", static_cast(Item::file)). + get(); + + if( !repair_item.found() ) { log << log3 << "ThreadInfo: there is no a file for thread file_id: " << file_id << logend; tdb->RemoveThread(file_id); diff --git a/winixd/plugins/thread/threadinfo.h b/winixd/plugins/thread/threadinfo.h index f1036a3..3904e74 100644 --- a/winixd/plugins/thread/threadinfo.h +++ b/winixd/plugins/thread/threadinfo.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,12 +36,12 @@ #define headerfile_winix_plugins_thread_threadinfo #include -#include "core/item.h" #include "core/system.h" #include "db/db.h" #include "thread.h" #include "tdb.h" #include "core/winixmodel.h" +#include "models/item.h" @@ -110,7 +110,7 @@ private: std::vector out_dir_tab; std::vector remove_answer_id_tab, repair_id_tab, repair_answer_tab; Item out_item, repair_item; - DbItemQuery iq; + //DbItemQuery iq; void RepairAnswer(long answer_id); void RepairAnswers(long file_id); diff --git a/winixd/plugins/ticket/Makefile.dep b/winixd/plugins/ticket/Makefile.dep index 0fe6d88..a1d3847 100644 --- a/winixd/plugins/ticket/Makefile.dep +++ b/winixd/plugins/ticket/Makefile.dep @@ -6,13 +6,12 @@ createticket.o: ../../../../winix/winixd/db/dbconn.h createticket.o: ../../../../winix/winixd/db/dbtextstream.h createticket.o: ../../../../winix/winixd/core/textstream.h createticket.o: ../../../../winix/winixd/core/misc.h -createticket.o: ../../../../winix/winixd/core/item.h +createticket.o: ../../../../winix/winixd/core/requesttypes.h +createticket.o: ../../../../pikotools/textstream/textstream.h createticket.o: ../../../../pikotools/space/space.h createticket.o: ../../../../pikotools/textstream/types.h createticket.o: ../../../../pikotools/date/date.h createticket.o: ../../../../pikotools/convert/inttostr.h -createticket.o: ../../../../winix/winixd/core/requesttypes.h -createticket.o: ../../../../pikotools/textstream/textstream.h createticket.o: ../../../../pikotools/membuffer/membuffer.h createticket.o: ../../../../pikotools/textstream/types.h createticket.o: ../../../../pikotools/utf8/utf8.h @@ -37,7 +36,6 @@ createticket.o: ../../../../winix/winixd/core/lock.h createticket.o: ../../../../winix/winixd/core/synchro.h createticket.o: ../../../../winix/winixd/core/error.h createticket.o: ../../../../winix/winixd/functions/functionbase.h -createticket.o: ../../../../winix/winixd/core/item.h createticket.o: ../../../../winix/winixd/db/db.h createticket.o: ../../../../winix/winixd/db/dbbase.h createticket.o: ../../../../winix/winixd/db/dbitemquery.h @@ -46,6 +44,23 @@ createticket.o: ../../../../winix/winixd/core/user.h createticket.o: ../../../../winix/winixd/core/group.h createticket.o: ../../../../winix/winixd/core/dircontainer.h createticket.o: ../../../../winix/winixd/core/winixbase.h +createticket.o: ../../../../winix/winixd/models/item.h +createticket.o: ../../../../morm/src/model.h +createticket.o: ../../../../morm/src/modelconnector.h +createticket.o: ../../../../morm/src/clearer.h +createticket.o: ../../../../morm/src/dbconnector.h +createticket.o: ../../../../morm/src/queryresult.h +createticket.o: ../../../../morm/src/flatconnector.h +createticket.o: ../../../../morm/src/dbexpression.h +createticket.o: ../../../../morm/src/baseexpression.h +createticket.o: ../../../../morm/src/morm_types.h +createticket.o: ../../../../morm/src/modelenv.h +createticket.o: ../../../../morm/src/modeldata.h +createticket.o: ../../../../morm/src/cursorhelper.h +createticket.o: ../../../../morm/src/finderhelper.h +createticket.o: ../../../../morm/src/fieldvaluehelper.h +createticket.o: ../../../../morm/src/flatexpression.h +createticket.o: ../../../../winix/winixd/models/itemcontent.h createticket.o: ../../../../winix/winixd/core/ugcontainer.h createticket.o: ../../../../winix/winixd/core/request.h createticket.o: ../../../../winix/winixd/core/error.h @@ -60,22 +75,8 @@ createticket.o: ../../../../winix/winixd/core/basethread.h createticket.o: ../../../../winix/winixd/core/winixmodel.h createticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h createticket.o: ../../../../winix/winixd/core/plugindata.h -createticket.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -createticket.o: ../../../../morm/src/model.h -createticket.o: ../../../../morm/src/modelconnector.h -createticket.o: ../../../../morm/src/clearer.h -createticket.o: ../../../../morm/src/dbconnector.h -createticket.o: ../../../../morm/src/queryresult.h -createticket.o: ../../../../morm/src/flatconnector.h -createticket.o: ../../../../morm/src/dbexpression.h -createticket.o: ../../../../morm/src/baseexpression.h -createticket.o: ../../../../morm/src/modelenv.h -createticket.o: ../../../../morm/src/modeldata.h -createticket.o: ../../../../morm/src/cursorhelper.h -createticket.o: ../../../../morm/src/finderhelper.h -createticket.o: ../../../../morm/src/fieldvaluehelper.h -createticket.o: ../../../../morm/src/flatexpression.h -createticket.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h +createticket.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h +createticket.o: ../../../../morm/src/cursor.h createticket.o: ../../../../morm/src/jsonexpression.h createticket.o: ../../../../morm/src/postgresqlexpression.h createticket.o: ../../../../morm/src/jsonconnector.h @@ -110,9 +111,10 @@ createticket.o: ../../../../winix/winixd/templates/patterns.h createticket.o: ../../../../winix/winixd/templates/locale.h createticket.o: ../../../../winix/winixd/templates/localefilter.h createticket.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -createticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -createticket.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -createticket.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +createticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +createticket.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +createticket.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +createticket.o: ../../../../ezc/src/pattern.h createticket.o: ../../../../ezc/src/expressionparser.h createticket.o: ../../../../ezc/src/patternparser.h createticket.o: ../../../../winix/winixd/notify/notifythread.h @@ -185,13 +187,12 @@ editticket.o: ../../../../winix/winixd/db/dbconn.h editticket.o: ../../../../winix/winixd/db/dbtextstream.h editticket.o: ../../../../winix/winixd/core/textstream.h editticket.o: ../../../../winix/winixd/core/misc.h -editticket.o: ../../../../winix/winixd/core/item.h +editticket.o: ../../../../winix/winixd/core/requesttypes.h +editticket.o: ../../../../pikotools/textstream/textstream.h editticket.o: ../../../../pikotools/space/space.h editticket.o: ../../../../pikotools/textstream/types.h editticket.o: ../../../../pikotools/date/date.h editticket.o: ../../../../pikotools/convert/inttostr.h -editticket.o: ../../../../winix/winixd/core/requesttypes.h -editticket.o: ../../../../pikotools/textstream/textstream.h editticket.o: ../../../../pikotools/membuffer/membuffer.h editticket.o: ../../../../pikotools/textstream/types.h editticket.o: ../../../../pikotools/utf8/utf8.h @@ -215,7 +216,6 @@ editticket.o: ../../../../winix/winixd/core/filelog.h editticket.o: ../../../../winix/winixd/core/lock.h editticket.o: ../../../../winix/winixd/core/synchro.h editticket.o: ../../../../winix/winixd/core/error.h ticketinfo.h -editticket.o: ../../../../winix/winixd/core/item.h editticket.o: ../../../../winix/winixd/core/system.h editticket.o: ../../../../winix/winixd/core/job.h editticket.o: ../../../../winix/winixd/core/basethread.h @@ -223,13 +223,13 @@ editticket.o: ../../../../winix/winixd/core/winixmodel.h editticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h editticket.o: ../../../../winix/winixd/core/plugindata.h editticket.o: ../../../../winix/winixd/core/winixbase.h -editticket.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -editticket.o: ../../../../morm/src/model.h editticket.o: ../../../../morm/src/modelconnector.h editticket.o: ../../../../morm/src/clearer.h editticket.o: ../../../../morm/src/dbconnector.h editticket.o: ../../../../morm/src/queryresult.h editticket.o: ../../../../morm/src/flatconnector.h +editticket.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h +editticket.o: ../../../../morm/src/model.h editticket.o: ../../../../morm/src/dbexpression.h editticket.o: ../../../../morm/src/baseexpression.h editticket.o: ../../../../morm/src/modelenv.h @@ -253,6 +253,8 @@ editticket.o: ../../../../winix/winixd/db/dbitemcolumns.h editticket.o: ../../../../winix/winixd/core/user.h editticket.o: ../../../../winix/winixd/core/group.h editticket.o: ../../../../winix/winixd/core/dircontainer.h +editticket.o: ../../../../winix/winixd/models/item.h +editticket.o: ../../../../winix/winixd/models/itemcontent.h editticket.o: ../../../../winix/winixd/core/ugcontainer.h editticket.o: ../../../../winix/winixd/core/request.h editticket.o: ../../../../winix/winixd/core/mounts.h @@ -284,10 +286,10 @@ editticket.o: ../../../../winix/winixd/templates/patterns.h editticket.o: ../../../../winix/winixd/templates/locale.h editticket.o: ../../../../winix/winixd/templates/localefilter.h editticket.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -editticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -editticket.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -editticket.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -editticket.o: ../../../../ezc/src/outstreams.h +editticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +editticket.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +editticket.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +editticket.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h editticket.o: ../../../../ezc/src/expressionparser.h editticket.o: ../../../../ezc/src/patternparser.h editticket.o: ../../../../winix/winixd/notify/notifythread.h @@ -363,13 +365,12 @@ funticket.o: ../../../../winix/winixd/db/dbconn.h funticket.o: ../../../../winix/winixd/db/dbtextstream.h funticket.o: ../../../../winix/winixd/core/textstream.h funticket.o: ../../../../winix/winixd/core/misc.h -funticket.o: ../../../../winix/winixd/core/item.h +funticket.o: ../../../../winix/winixd/core/requesttypes.h +funticket.o: ../../../../pikotools/textstream/textstream.h funticket.o: ../../../../pikotools/space/space.h funticket.o: ../../../../pikotools/textstream/types.h funticket.o: ../../../../pikotools/date/date.h funticket.o: ../../../../pikotools/convert/inttostr.h -funticket.o: ../../../../winix/winixd/core/requesttypes.h -funticket.o: ../../../../pikotools/textstream/textstream.h funticket.o: ../../../../pikotools/membuffer/membuffer.h funticket.o: ../../../../pikotools/textstream/types.h funticket.o: ../../../../pikotools/utf8/utf8.h @@ -393,7 +394,6 @@ funticket.o: ../../../../winix/winixd/core/filelog.h funticket.o: ../../../../winix/winixd/core/lock.h funticket.o: ../../../../winix/winixd/core/synchro.h funticket.o: ../../../../winix/winixd/core/error.h ticketinfo.h -funticket.o: ../../../../winix/winixd/core/item.h funticket.o: ../../../../winix/winixd/core/system.h funticket.o: ../../../../winix/winixd/core/job.h funticket.o: ../../../../winix/winixd/core/basethread.h @@ -401,13 +401,12 @@ funticket.o: ../../../../winix/winixd/core/winixmodel.h funticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h funticket.o: ../../../../winix/winixd/core/plugindata.h funticket.o: ../../../../winix/winixd/core/winixbase.h -funticket.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -funticket.o: ../../../../morm/src/model.h funticket.o: ../../../../morm/src/modelconnector.h funticket.o: ../../../../morm/src/clearer.h funticket.o: ../../../../morm/src/dbconnector.h funticket.o: ../../../../morm/src/queryresult.h -funticket.o: ../../../../morm/src/flatconnector.h +funticket.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h +funticket.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h funticket.o: ../../../../morm/src/dbexpression.h funticket.o: ../../../../morm/src/baseexpression.h funticket.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h @@ -430,6 +429,8 @@ funticket.o: ../../../../winix/winixd/db/dbitemcolumns.h funticket.o: ../../../../winix/winixd/core/user.h funticket.o: ../../../../winix/winixd/core/group.h funticket.o: ../../../../winix/winixd/core/dircontainer.h +funticket.o: ../../../../winix/winixd/models/item.h +funticket.o: ../../../../winix/winixd/models/itemcontent.h funticket.o: ../../../../winix/winixd/core/ugcontainer.h funticket.o: ../../../../winix/winixd/core/request.h funticket.o: ../../../../winix/winixd/core/mounts.h @@ -461,10 +462,10 @@ funticket.o: ../../../../winix/winixd/templates/patterns.h funticket.o: ../../../../winix/winixd/templates/locale.h funticket.o: ../../../../winix/winixd/templates/localefilter.h funticket.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -funticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -funticket.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -funticket.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -funticket.o: ../../../../ezc/src/outstreams.h +funticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +funticket.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +funticket.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +funticket.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h funticket.o: ../../../../ezc/src/expressionparser.h funticket.o: ../../../../ezc/src/patternparser.h funticket.o: ../../../../winix/winixd/notify/notifythread.h @@ -539,13 +540,12 @@ 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/item.h +init.o: ../../../../winix/winixd/core/requesttypes.h +init.o: ../../../../pikotools/textstream/textstream.h init.o: ../../../../pikotools/space/space.h init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/date/date.h init.o: ../../../../pikotools/convert/inttostr.h -init.o: ../../../../winix/winixd/core/requesttypes.h -init.o: ../../../../pikotools/textstream/textstream.h init.o: ../../../../pikotools/membuffer/membuffer.h init.o: ../../../../pikotools/textstream/types.h init.o: ../../../../pikotools/utf8/utf8.h @@ -568,18 +568,17 @@ 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 funticket.h ticketinfo.h -init.o: ../../../../winix/winixd/core/item.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/winixmodel.h init.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h init.o: ../../../../winix/winixd/core/plugindata.h -init.o: ../../../../winix/winixd/core/winixbase.h ../../../../morm/src/morm.h -init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h +init.o: ../../../../winix/winixd/core/winixbase.h init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h -init.o: ../../../../morm/src/flatconnector.h +init.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h +init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h init.o: ../../../../morm/src/dbexpression.h init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h @@ -599,6 +598,8 @@ init.o: ../../../../winix/winixd/db/dbitemcolumns.h init.o: ../../../../winix/winixd/core/user.h init.o: ../../../../winix/winixd/core/group.h init.o: ../../../../winix/winixd/core/dircontainer.h +init.o: ../../../../winix/winixd/models/item.h +init.o: ../../../../winix/winixd/models/itemcontent.h init.o: ../../../../winix/winixd/core/ugcontainer.h init.o: ../../../../winix/winixd/core/request.h init.o: ../../../../winix/winixd/core/mounts.h @@ -630,10 +631,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h init.o: ../../../../winix/winixd/templates/locale.h init.o: ../../../../winix/winixd/templates/localefilter.h init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -init.o: ../../../../ezc/src/outstreams.h +init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h init.o: ../../../../ezc/src/expressionparser.h init.o: ../../../../ezc/src/patternparser.h init.o: ../../../../winix/winixd/notify/notifythread.h @@ -719,13 +720,12 @@ showtickets.o: ../../../../winix/winixd/db/dbconn.h showtickets.o: ../../../../winix/winixd/db/dbtextstream.h showtickets.o: ../../../../winix/winixd/core/textstream.h showtickets.o: ../../../../winix/winixd/core/misc.h -showtickets.o: ../../../../winix/winixd/core/item.h +showtickets.o: ../../../../winix/winixd/core/requesttypes.h +showtickets.o: ../../../../pikotools/textstream/textstream.h showtickets.o: ../../../../pikotools/space/space.h showtickets.o: ../../../../pikotools/textstream/types.h showtickets.o: ../../../../pikotools/date/date.h showtickets.o: ../../../../pikotools/convert/inttostr.h -showtickets.o: ../../../../winix/winixd/core/requesttypes.h -showtickets.o: ../../../../pikotools/textstream/textstream.h showtickets.o: ../../../../pikotools/membuffer/membuffer.h showtickets.o: ../../../../pikotools/textstream/types.h showtickets.o: ../../../../pikotools/utf8/utf8.h @@ -749,7 +749,6 @@ showtickets.o: ../../../../winix/winixd/core/filelog.h showtickets.o: ../../../../winix/winixd/core/lock.h showtickets.o: ../../../../winix/winixd/core/synchro.h showtickets.o: ../../../../winix/winixd/core/error.h ticketinfo.h -showtickets.o: ../../../../winix/winixd/core/item.h showtickets.o: ../../../../winix/winixd/core/system.h showtickets.o: ../../../../winix/winixd/core/job.h showtickets.o: ../../../../winix/winixd/core/basethread.h @@ -757,13 +756,13 @@ showtickets.o: ../../../../winix/winixd/core/winixmodel.h showtickets.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h showtickets.o: ../../../../winix/winixd/core/plugindata.h showtickets.o: ../../../../winix/winixd/core/winixbase.h -showtickets.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -showtickets.o: ../../../../morm/src/model.h showtickets.o: ../../../../morm/src/modelconnector.h showtickets.o: ../../../../morm/src/clearer.h showtickets.o: ../../../../morm/src/dbconnector.h showtickets.o: ../../../../morm/src/queryresult.h showtickets.o: ../../../../morm/src/flatconnector.h +showtickets.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h +showtickets.o: ../../../../morm/src/model.h showtickets.o: ../../../../morm/src/dbexpression.h showtickets.o: ../../../../morm/src/baseexpression.h showtickets.o: ../../../../morm/src/modelenv.h @@ -787,6 +786,8 @@ showtickets.o: ../../../../winix/winixd/db/dbitemcolumns.h showtickets.o: ../../../../winix/winixd/core/user.h showtickets.o: ../../../../winix/winixd/core/group.h showtickets.o: ../../../../winix/winixd/core/dircontainer.h +showtickets.o: ../../../../winix/winixd/models/item.h +showtickets.o: ../../../../winix/winixd/models/itemcontent.h showtickets.o: ../../../../winix/winixd/core/ugcontainer.h showtickets.o: ../../../../winix/winixd/core/request.h showtickets.o: ../../../../winix/winixd/core/mounts.h @@ -818,10 +819,10 @@ showtickets.o: ../../../../winix/winixd/templates/patterns.h showtickets.o: ../../../../winix/winixd/templates/locale.h showtickets.o: ../../../../winix/winixd/templates/localefilter.h showtickets.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -showtickets.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -showtickets.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -showtickets.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -showtickets.o: ../../../../ezc/src/outstreams.h +showtickets.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +showtickets.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +showtickets.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +showtickets.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h showtickets.o: ../../../../ezc/src/expressionparser.h showtickets.o: ../../../../ezc/src/patternparser.h showtickets.o: ../../../../winix/winixd/notify/notifythread.h @@ -896,13 +897,12 @@ tdb.o: ../../../../winix/winixd/db/dbconn.h tdb.o: ../../../../winix/winixd/db/dbtextstream.h tdb.o: ../../../../winix/winixd/core/textstream.h tdb.o: ../../../../winix/winixd/core/misc.h -tdb.o: ../../../../winix/winixd/core/item.h +tdb.o: ../../../../winix/winixd/core/requesttypes.h +tdb.o: ../../../../pikotools/textstream/textstream.h tdb.o: ../../../../pikotools/space/space.h tdb.o: ../../../../pikotools/textstream/types.h tdb.o: ../../../../pikotools/date/date.h tdb.o: ../../../../pikotools/convert/inttostr.h -tdb.o: ../../../../winix/winixd/core/requesttypes.h -tdb.o: ../../../../pikotools/textstream/textstream.h tdb.o: ../../../../pikotools/membuffer/membuffer.h tdb.o: ../../../../pikotools/textstream/types.h tdb.o: ../../../../pikotools/utf8/utf8.h @@ -926,15 +926,14 @@ tdb.o: ../../../../winix/winixd/core/lock.h tdb.o: ../../../../winix/winixd/core/synchro.h tdb.o: ../../../../winix/winixd/core/error.h templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -templates.o: ../../../../ezc/src/blocks.h -templates.o: ../../../../winix/winixd/core/item.h +templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +templates.o: ../../../../pikotools/utf8/utf8.h +templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/space/space.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../pikotools/date/date.h templates.o: ../../../../pikotools/convert/inttostr.h -templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h -templates.o: ../../../../pikotools/utf8/utf8.h -templates.o: ../../../../pikotools/textstream/textstream.h templates.o: ../../../../pikotools/membuffer/membuffer.h templates.o: ../../../../pikotools/textstream/types.h templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h @@ -943,7 +942,6 @@ templates.o: ../../../../ezc/src/expressionparser.h templates.o: ../../../../ezc/src/patternparser.h templates.o: ../../../../pikotools/log/log.h templates.o: ../../../../pikotools/log/filelog.h ticketinfo.h ticket.h -templates.o: ../../../../winix/winixd/core/item.h templates.o: ../../../../winix/winixd/core/system.h templates.o: ../../../../winix/winixd/core/job.h templates.o: ../../../../winix/winixd/core/basethread.h @@ -962,13 +960,12 @@ templates.o: ../../../../winix/winixd/core/lock.h templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h templates.o: ../../../../winix/winixd/core/plugindata.h templates.o: ../../../../winix/winixd/core/winixbase.h -templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -templates.o: ../../../../morm/src/model.h templates.o: ../../../../morm/src/modelconnector.h templates.o: ../../../../morm/src/clearer.h templates.o: ../../../../morm/src/dbconnector.h templates.o: ../../../../morm/src/queryresult.h -templates.o: ../../../../morm/src/flatconnector.h +templates.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h +templates.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h templates.o: ../../../../morm/src/dbexpression.h templates.o: ../../../../morm/src/baseexpression.h templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h @@ -991,6 +988,8 @@ templates.o: ../../../../winix/winixd/db/dbitemcolumns.h templates.o: ../../../../winix/winixd/core/user.h templates.o: ../../../../winix/winixd/core/group.h templates.o: ../../../../winix/winixd/core/dircontainer.h +templates.o: ../../../../winix/winixd/models/item.h +templates.o: ../../../../winix/winixd/models/itemcontent.h templates.o: ../../../../winix/winixd/core/ugcontainer.h templates.o: ../../../../winix/winixd/core/request.h templates.o: ../../../../winix/winixd/core/mounts.h @@ -1113,8 +1112,7 @@ templates.o: ../../../../winix/winixd/functions/rm.h templates.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h templates.o: ../../../../winix/winixd/templates/miscspace.h templates.o: ../../../../winix/winixd/templates/templates.h -ticketinfo.o: ticketinfo.h ticket.h ../../../../winix/winixd/core/item.h -ticketinfo.o: ../../../../winix/winixd/core/system.h +ticketinfo.o: ticketinfo.h ticket.h ../../../../winix/winixd/core/system.h ticketinfo.o: ../../../../winix/winixd/core/job.h ticketinfo.o: ../../../../winix/winixd/core/basethread.h ticketinfo.o: ../../../../winix/winixd/core/synchro.h @@ -1141,13 +1139,13 @@ ticketinfo.o: ../../../../winix/winixd/core/lock.h ticketinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h ticketinfo.o: ../../../../winix/winixd/core/plugindata.h ticketinfo.o: ../../../../winix/winixd/core/winixbase.h -ticketinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h -ticketinfo.o: ../../../../morm/src/model.h ticketinfo.o: ../../../../morm/src/modelconnector.h ticketinfo.o: ../../../../morm/src/clearer.h ticketinfo.o: ../../../../morm/src/dbconnector.h ticketinfo.o: ../../../../morm/src/queryresult.h ticketinfo.o: ../../../../morm/src/flatconnector.h +ticketinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h +ticketinfo.o: ../../../../morm/src/model.h ticketinfo.o: ../../../../morm/src/dbexpression.h ticketinfo.o: ../../../../morm/src/baseexpression.h ticketinfo.o: ../../../../morm/src/modelenv.h @@ -1164,7 +1162,6 @@ ticketinfo.o: ../../../../morm/src/jsonconnector.h ticketinfo.o: ../../../../morm/src/postgresqlconnector.h ticketinfo.o: ../../../../morm/src/postgresqlqueryresult.h ticketinfo.o: ../../../../winix/winixd/core/dirs.h -ticketinfo.o: ../../../../winix/winixd/core/item.h ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h ticketinfo.o: ../../../../winix/winixd/db/db.h ticketinfo.o: ../../../../winix/winixd/db/dbbase.h @@ -1173,6 +1170,8 @@ ticketinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h ticketinfo.o: ../../../../winix/winixd/core/user.h ticketinfo.o: ../../../../winix/winixd/core/group.h ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h +ticketinfo.o: ../../../../winix/winixd/models/item.h +ticketinfo.o: ../../../../winix/winixd/models/itemcontent.h ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h ticketinfo.o: ../../../../winix/winixd/core/request.h ticketinfo.o: ../../../../winix/winixd/core/mounts.h @@ -1204,10 +1203,10 @@ ticketinfo.o: ../../../../winix/winixd/templates/patterns.h ticketinfo.o: ../../../../winix/winixd/templates/locale.h ticketinfo.o: ../../../../winix/winixd/templates/localefilter.h ticketinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h -ticketinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h -ticketinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h -ticketinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h -ticketinfo.o: ../../../../ezc/src/outstreams.h +ticketinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h +ticketinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h +ticketinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h +ticketinfo.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h ticketinfo.o: ../../../../ezc/src/expressionparser.h ticketinfo.o: ../../../../ezc/src/patternparser.h ticketinfo.o: ../../../../winix/winixd/core/misc.h diff --git a/winixd/plugins/ticket/createticket.cpp b/winixd/plugins/ticket/createticket.cpp index 2c33dc9..3ce925c 100644 --- a/winixd/plugins/ticket/createticket.cpp +++ b/winixd/plugins/ticket/createticket.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -112,7 +112,7 @@ void CreateTicket::Submit(Ticket & ticket, Item & item) return; functions->SetUser(item); - item.privileges = system->NewFilePrivileges(); + item.item_content.privileges = system->NewFilePrivileges(); item.parent_id = cur->request->dir_tab.back()->id; plugin->Call(WINIX_PL_TICKET_PREPARE_TO_ADD_TICKET, &item, &ticket); diff --git a/winixd/plugins/ticket/editticket.cpp b/winixd/plugins/ticket/editticket.cpp index de517bf..6ff5f74 100644 --- a/winixd/plugins/ticket/editticket.cpp +++ b/winixd/plugins/ticket/editticket.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -182,7 +182,7 @@ PT::Space & EditTicket::PrepareSpace() if( is_new ) { - PT::Space * ticket_space = cur->request->item.meta.FindSpace(L"ticket"); + PT::Space * ticket_space = cur->request->item.item_content.meta.FindSpace(L"ticket"); if( ticket_space ) { @@ -198,13 +198,14 @@ return new_space; bool EditTicket::CloseTicket() { - PT::Space & ticket_space = cur->request->item.ameta.FindAddSpace(L"ticket"); + PT::Space & ticket_space = cur->request->item.item_content.meta_admin.FindAddSpace(L"ticket"); ticket_space.Add(L"closed", true); - PT::Space & thread_space = cur->request->item.ameta.FindAddSpace(L"thread"); + PT::Space & thread_space = cur->request->item.item_content.meta_admin.FindAddSpace(L"thread"); thread_space.Add(L"closed", true); - if( db->EditAdminMetaById(cur->request->item.ameta, cur->request->item.id) == WINIX_ERR_OK ) + //if( db->EditAdminMetaById(cur->request->item.ameta, cur->request->item.id) == WINIX_ERR_OK ) + if( cur->request->item.update(false, true) ) { log << log3 << "EditTicket: closing ticket" << logend; return true; diff --git a/winixd/plugins/ticket/showtickets.cpp b/winixd/plugins/ticket/showtickets.cpp index fa3a0c4..5bdfc56 100644 --- a/winixd/plugins/ticket/showtickets.cpp +++ b/winixd/plugins/ticket/showtickets.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -89,7 +89,7 @@ bool ShowTickets::Sort::operator()(const Item * item1, const Item * item2) if( item1->sort_index != item2->sort_index ) return item1->sort_index < item2->sort_index; - return item1->date_creation > item2->date_creation; + return item1->item_content.date_creation > item2->item_content.date_creation; } } @@ -99,23 +99,33 @@ bool ShowTickets::Sort::operator()(const Item * item1, const Item * item2) void ShowTickets::ReadFiles(long dir_id) { // reading files - DbItemQuery iq; - iq.SetAll(false, false); - iq.sel_url = true; - iq.sel_subject = true; - iq.sel_date = true; - iq.sel_user_id = true; - iq.sel_group_id = true; - iq.sel_guest_name = true; - iq.sel_privileges = true; - iq.sel_date = true; - iq.sel_meta = true; - iq.sel_sort_index = true; - iq.WhereParentId(dir_id); - iq.WhereType(Item::file); - iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE); +// DbItemQuery iq; +// iq.SetAll(false, false); +// iq.sel_url = true; +// iq.sel_subject = true; +// iq.sel_date = true; +// iq.sel_user_id = true; +// iq.sel_group_id = true; +// iq.sel_guest_name = true; +// iq.sel_privileges = true; +// iq.sel_date = true; +// iq.sel_meta = true; +// iq.sel_sort_index = true; +// iq.WhereParentId(dir_id); +// iq.WhereType(Item::file); +// iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE); - db->GetItems(ticket_info->item_tab, iq); + morm::Finder finder(model_connector); + + finder. + select(). + where(). + eq(L"parent_id", dir_id). + eq(L"type", static_cast(Item::file)). + eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE). + get_vector(ticket_info->item_tab); + + //db->GetItems(ticket_info->item_tab, iq); system->CheckAccessToItems(ticket_info->item_tab); } diff --git a/winixd/plugins/ticket/showtickets.h b/winixd/plugins/ticket/showtickets.h index fb3e330..e7e4797 100644 --- a/winixd/plugins/ticket/showtickets.h +++ b/winixd/plugins/ticket/showtickets.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,8 +37,9 @@ #include "tdb.h" #include "ticketinfo.h" -#include "core/item.h" #include "functions/functionbase.h" +#include "models/item.h" + namespace Winix { diff --git a/winixd/plugins/ticket/templates.cpp b/winixd/plugins/ticket/templates.cpp index 52a6b75..31f10c1 100644 --- a/winixd/plugins/ticket/templates.cpp +++ b/winixd/plugins/ticket/templates.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -307,12 +307,12 @@ void ticket_is_creating_new(Info & i) void ticket_meta_value(Info & i) { if( ticket_info.item ) - space_value(i, ticket_info.item->meta); + space_value(i, ticket_info.item->item_content.meta); } void ticket_is_closed(Info & i) { - PT::Space * ticket_space = ticket_info.item->ameta.FindSpace(L"ticket"); + PT::Space * ticket_space = ticket_info.item->item_content.meta_admin.FindSpace(L"ticket"); if( ticket_space ) i.res = ticket_space->Bool(L"closed", false); @@ -343,7 +343,7 @@ void ticket_param_value_for_param_id(Info & i) if( ticket_info.ticket && ticket_info.item ) { - find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->meta); + find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->item_content.meta); ticket_print_value(i, value_for_param_id); } @@ -378,7 +378,7 @@ void ticket_does_param_id_have_value(Info & i) if( ticket_info.ticket && ticket_info.item ) { - find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->meta); + find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->item_content.meta); if( value_for_param_id.is_value ) { @@ -545,7 +545,7 @@ void tickets_tab_is_closed(Info & i) if( tickets_value.is_item ) { - PT::Space * ticket_space = tickets_value.item->ameta.FindSpace(L"ticket"); + PT::Space * ticket_space = tickets_value.item->item_content.meta_admin.FindSpace(L"ticket"); if( ticket_space ) i.res = ticket_space->Bool(L"closed", false); @@ -587,7 +587,7 @@ void tickets_tab_meta_value(Info & i) tickets_tab_check_reqid(); if( tickets_value.is_item ) - space_value(i, tickets_value.item->meta); + space_value(i, tickets_value.item->item_content.meta); } @@ -599,7 +599,7 @@ void tickets_tab_date_creation(Info & i) tickets_tab_check_reqid(); if( tickets_value.is_item ) - i.out << tickets_value.item->date_creation; + i.out << tickets_value.item->item_content.date_creation; } @@ -609,7 +609,7 @@ void tickets_tab_date_creation_nice(Info & i) tickets_tab_check_reqid(); if( tickets_value.is_item ) - print_date_nice(i, tickets_value.item->date_creation); + print_date_nice(i, tickets_value.item->item_content.date_creation); } @@ -637,7 +637,7 @@ void tickets_tab_param_value_for_param_id(Info & i) value_for_param_id.config_par = space.spaces[param_index]; value_for_param_id.param_id = value_for_param_id.config_par->Long(L"id"); - find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->meta); + find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->item_content.meta); ticket_print_value(i, value_for_param_id); break; @@ -670,7 +670,7 @@ void tickets_tab_does_param_id_have_value(Info & i) value_for_param_id.config_par = space.spaces[param_index]; value_for_param_id.param_id = value_for_param_id.config_par->Long(L"id"); - find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->meta); + find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->item_content.meta); if( value_for_param_id.is_value ) { @@ -712,7 +712,7 @@ void tickets_tab_conf_tab(Info & i) value.is_param = true; value.config_par = space.spaces[conf_index]; value.param_id = value.config_par->Long(L"id"); - find_ticket_value(value, tickets_value.ticket->par_tab, tickets_value.item->meta); + find_ticket_value(value, tickets_value.ticket->par_tab, tickets_value.item->item_content.meta); } } } @@ -925,7 +925,7 @@ void ticket_tab(Info & i) value.param_id = value.config_par->Long(L"id"); if( ticket_info.ticket && ticket_info.item ) - find_ticket_value(value, ticket_info.ticket->par_tab, ticket_info.item->meta); + find_ticket_value(value, ticket_info.ticket->par_tab, ticket_info.item->item_content.meta); } } diff --git a/winixd/plugins/ticket/ticketinfo.cpp b/winixd/plugins/ticket/ticketinfo.cpp index 72d95b8..c83bdf0 100644 --- a/winixd/plugins/ticket/ticketinfo.cpp +++ b/winixd/plugins/ticket/ticketinfo.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -169,7 +169,7 @@ bool TicketInfo::ParseTicketConf(long mount_dir_id, const std::wstring & path) conf_parser.SetSpace(conf_tab[mount_dir_id].conf); conf_tab[mount_dir_id].conf.Clear(); -return (conf_parser.ParseString(config_file.content) == PT::SpaceParser::ok); +return (conf_parser.ParseString(config_file.item_content.content_raw) == PT::SpaceParser::ok); } @@ -394,8 +394,8 @@ void TicketInfo::ReadTicketValue(PT::Space & space, file.Clear(); // clearing and setting date file.parent_id = upload_dir.id; file.type = Item::file; - file.privileges = system->NewFilePrivileges(); - file.file_type = SelectFileType(value.filename); + file.item_content.privileges = system->NewFilePrivileges(); + file.item_content.file_type = SelectFileType(value.filename); file.url = value.filename; functions->PrepareUrl(file); functions->SetUser(file); @@ -406,7 +406,7 @@ void TicketInfo::ReadTicketValue(PT::Space & space, PT::Space & space = FindAddMetaByParam(meta, param_id); PT::Space & file_space = space.AddSpace(L"file"); - if( file.file_type == WINIX_ITEM_FILETYPE_IMAGE ) + if( file.item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE ) file_space.Add(L"type", L"image"); else file_space.Add(L"type", L"file"); @@ -616,7 +616,7 @@ void TicketInfo::RemoveTicket(long file_id) void TicketInfo::CopyTicketSpace(PT::Space & ticket_space, Item & item) { - PT::Space & ticket_meta = item.meta.FindAddSpace(L"ticket"); + PT::Space & ticket_meta = item.item_content.meta.FindAddSpace(L"ticket"); ticket_meta = ticket_space; ticket_meta.name = L"ticket"; } diff --git a/winixd/plugins/ticket/ticketinfo.h b/winixd/plugins/ticket/ticketinfo.h index 0c1b0d6..a9b6bc1 100644 --- a/winixd/plugins/ticket/ticketinfo.h +++ b/winixd/plugins/ticket/ticketinfo.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,13 +37,13 @@ #include #include "ticket.h" -#include "core/item.h" #include "core/system.h" #include "functions/functions.h" #include "db/db.h" #include "tdb.h" #include "space/spaceparser.h" #include "core/winixmodel.h" +#include "models/item.h" namespace Winix diff --git a/winixd/templates/Makefile.dep b/winixd/templates/Makefile.dep index fecdaa1..7051436 100644 --- a/winixd/templates/Makefile.dep +++ b/winixd/templates/Makefile.dep @@ -30,8 +30,17 @@ adduser.o: ../../../pikotools/convert/patternreplacer.h adduser.o: ../../../pikotools/convert/strtoint.h adduser.o: ../../../pikotools/convert/text.h htmltextstream.h adduser.o: ../../../winix/winixd/core/textstream.h patterncacher.h -adduser.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -adduser.o: changepatterns.h ../../../winix/winixd/core/cur.h +adduser.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +adduser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +adduser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +adduser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +adduser.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +adduser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +adduser.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +adduser.o: ../../../morm/src/fieldvaluehelper.h +adduser.o: ../../../morm/src/flatexpression.h +adduser.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +adduser.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h adduser.o: ../../../winix/winixd/core/request.h adduser.o: ../../../winix/winixd/core/requesttypes.h adduser.o: ../../../winix/winixd/core/error.h @@ -52,16 +61,8 @@ adduser.o: ../../../winix/winixd/core/basethread.h adduser.o: ../../../winix/winixd/core/winixmodel.h adduser.o: ../../../winix/winixd/core/plugin.h adduser.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -adduser.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -adduser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -adduser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -adduser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -adduser.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -adduser.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -adduser.o: ../../../morm/src/finderhelper.h -adduser.o: ../../../morm/src/fieldvaluehelper.h -adduser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -adduser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +adduser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +adduser.o: ../../../morm/src/jsonexpression.h adduser.o: ../../../morm/src/postgresqlexpression.h adduser.o: ../../../morm/src/jsonconnector.h adduser.o: ../../../morm/src/postgresqlconnector.h @@ -143,8 +144,18 @@ antispam.o: ../../../pikotools/convert/patternreplacer.h antispam.o: ../../../pikotools/convert/strtoint.h antispam.o: ../../../pikotools/convert/text.h htmltextstream.h antispam.o: ../../../winix/winixd/core/textstream.h patterncacher.h -antispam.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -antispam.o: changepatterns.h ../../../winix/winixd/core/cur.h +antispam.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +antispam.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +antispam.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +antispam.o: ../../../morm/src/flatconnector.h +antispam.o: ../../../morm/src/dbexpression.h +antispam.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +antispam.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +antispam.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +antispam.o: ../../../morm/src/fieldvaluehelper.h +antispam.o: ../../../morm/src/flatexpression.h +antispam.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +antispam.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h antispam.o: ../../../winix/winixd/core/request.h antispam.o: ../../../winix/winixd/core/requesttypes.h antispam.o: ../../../winix/winixd/core/error.h @@ -165,17 +176,8 @@ antispam.o: ../../../winix/winixd/core/basethread.h antispam.o: ../../../winix/winixd/core/winixmodel.h antispam.o: ../../../winix/winixd/core/plugin.h antispam.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -antispam.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -antispam.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -antispam.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -antispam.o: ../../../morm/src/flatconnector.h -antispam.o: ../../../morm/src/dbexpression.h -antispam.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -antispam.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -antispam.o: ../../../morm/src/finderhelper.h -antispam.o: ../../../morm/src/fieldvaluehelper.h -antispam.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -antispam.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +antispam.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +antispam.o: ../../../morm/src/jsonexpression.h antispam.o: ../../../morm/src/postgresqlexpression.h antispam.o: ../../../morm/src/jsonconnector.h antispam.o: ../../../morm/src/postgresqlconnector.h @@ -295,8 +297,17 @@ config.o: ../../../pikotools/convert/patternreplacer.h config.o: ../../../pikotools/convert/strtoint.h config.o: ../../../pikotools/convert/text.h htmltextstream.h config.o: ../../../winix/winixd/core/textstream.h patterncacher.h -config.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -config.o: changepatterns.h ../../../winix/winixd/core/cur.h +config.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +config.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +config.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +config.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +config.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +config.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +config.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +config.o: ../../../morm/src/fieldvaluehelper.h +config.o: ../../../morm/src/flatexpression.h +config.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +config.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h config.o: ../../../winix/winixd/core/request.h config.o: ../../../winix/winixd/core/requesttypes.h config.o: ../../../winix/winixd/core/error.h @@ -317,16 +328,8 @@ config.o: ../../../winix/winixd/core/basethread.h config.o: ../../../winix/winixd/core/winixmodel.h config.o: ../../../winix/winixd/core/plugin.h config.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -config.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -config.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -config.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -config.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -config.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -config.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -config.o: ../../../morm/src/finderhelper.h -config.o: ../../../morm/src/fieldvaluehelper.h -config.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -config.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +config.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +config.o: ../../../morm/src/jsonexpression.h config.o: ../../../morm/src/postgresqlexpression.h config.o: ../../../morm/src/jsonconnector.h config.o: ../../../morm/src/postgresqlconnector.h @@ -407,8 +410,20 @@ currentdate.o: ../../../pikotools/convert/patternreplacer.h currentdate.o: ../../../pikotools/convert/strtoint.h currentdate.o: ../../../pikotools/convert/text.h htmltextstream.h currentdate.o: ../../../winix/winixd/core/textstream.h patterncacher.h -currentdate.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -currentdate.o: changepatterns.h ../../../winix/winixd/core/cur.h +currentdate.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +currentdate.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +currentdate.o: ../../../morm/src/dbconnector.h +currentdate.o: ../../../morm/src/queryresult.h +currentdate.o: ../../../morm/src/flatconnector.h +currentdate.o: ../../../morm/src/dbexpression.h +currentdate.o: ../../../morm/src/baseexpression.h +currentdate.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +currentdate.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +currentdate.o: ../../../morm/src/finderhelper.h +currentdate.o: ../../../morm/src/fieldvaluehelper.h +currentdate.o: ../../../morm/src/flatexpression.h +currentdate.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +currentdate.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h currentdate.o: ../../../winix/winixd/core/request.h currentdate.o: ../../../winix/winixd/core/requesttypes.h currentdate.o: ../../../winix/winixd/core/error.h @@ -429,18 +444,7 @@ currentdate.o: ../../../winix/winixd/core/basethread.h currentdate.o: ../../../winix/winixd/core/winixmodel.h currentdate.o: ../../../winix/winixd/core/plugin.h currentdate.o: ../../../winix/winixd/core/pluginmsg.h -currentdate.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h -currentdate.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h -currentdate.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h -currentdate.o: ../../../morm/src/queryresult.h -currentdate.o: ../../../morm/src/flatconnector.h -currentdate.o: ../../../morm/src/dbexpression.h -currentdate.o: ../../../morm/src/baseexpression.h -currentdate.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h -currentdate.o: ../../../morm/src/cursorhelper.h -currentdate.o: ../../../morm/src/finderhelper.h -currentdate.o: ../../../morm/src/fieldvaluehelper.h -currentdate.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h +currentdate.o: ../../../morm/src/morm.h ../../../morm/src/finder.h currentdate.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h currentdate.o: ../../../morm/src/postgresqlexpression.h currentdate.o: ../../../morm/src/jsonconnector.h @@ -568,7 +572,16 @@ dir.o: ../../../pikotools/convert/patternreplacer.h dir.o: ../../../pikotools/convert/strtoint.h dir.o: ../../../pikotools/convert/text.h htmltextstream.h dir.o: ../../../winix/winixd/core/textstream.h patterncacher.h -dir.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +dir.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +dir.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +dir.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +dir.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +dir.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +dir.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +dir.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +dir.o: ../../../morm/src/fieldvaluehelper.h +dir.o: ../../../morm/src/flatexpression.h +dir.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h dir.o: changepatterns.h ../../../winix/winixd/core/cur.h dir.o: ../../../winix/winixd/core/request.h dir.o: ../../../winix/winixd/core/requesttypes.h @@ -586,15 +599,8 @@ dir.o: ../../../winix/winixd/core/basethread.h dir.o: ../../../winix/winixd/core/winixmodel.h dir.o: ../../../winix/winixd/core/plugin.h dir.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -dir.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -dir.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -dir.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -dir.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -dir.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -dir.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -dir.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -dir.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -dir.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +dir.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +dir.o: ../../../morm/src/jsonexpression.h dir.o: ../../../morm/src/postgresqlexpression.h dir.o: ../../../morm/src/jsonconnector.h dir.o: ../../../morm/src/postgresqlconnector.h @@ -716,7 +722,16 @@ doc.o: ../../../pikotools/convert/patternreplacer.h doc.o: ../../../pikotools/convert/strtoint.h doc.o: ../../../pikotools/convert/text.h htmltextstream.h doc.o: ../../../winix/winixd/core/textstream.h patterncacher.h -doc.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +doc.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +doc.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +doc.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +doc.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +doc.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +doc.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +doc.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +doc.o: ../../../morm/src/fieldvaluehelper.h +doc.o: ../../../morm/src/flatexpression.h +doc.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h doc.o: changepatterns.h ../../../winix/winixd/core/cur.h doc.o: ../../../winix/winixd/core/request.h doc.o: ../../../winix/winixd/core/requesttypes.h @@ -734,15 +749,8 @@ doc.o: ../../../winix/winixd/core/basethread.h doc.o: ../../../winix/winixd/core/winixmodel.h doc.o: ../../../winix/winixd/core/plugin.h doc.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -doc.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -doc.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -doc.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -doc.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -doc.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -doc.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -doc.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -doc.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -doc.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +doc.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +doc.o: ../../../morm/src/jsonexpression.h doc.o: ../../../morm/src/postgresqlexpression.h doc.o: ../../../morm/src/jsonconnector.h doc.o: ../../../morm/src/postgresqlconnector.h @@ -820,7 +828,16 @@ env.o: ../../../pikotools/convert/patternreplacer.h env.o: ../../../pikotools/convert/strtoint.h env.o: ../../../pikotools/convert/text.h htmltextstream.h env.o: ../../../winix/winixd/core/textstream.h patterncacher.h -env.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +env.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +env.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +env.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +env.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +env.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +env.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +env.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +env.o: ../../../morm/src/fieldvaluehelper.h +env.o: ../../../morm/src/flatexpression.h +env.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h env.o: changepatterns.h ../../../winix/winixd/core/cur.h env.o: ../../../winix/winixd/core/request.h env.o: ../../../winix/winixd/core/requesttypes.h @@ -838,15 +855,8 @@ env.o: ../../../winix/winixd/core/basethread.h env.o: ../../../winix/winixd/core/winixmodel.h env.o: ../../../winix/winixd/core/plugin.h env.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -env.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -env.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -env.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -env.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -env.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -env.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -env.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -env.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -env.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +env.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +env.o: ../../../morm/src/jsonexpression.h env.o: ../../../morm/src/postgresqlexpression.h env.o: ../../../morm/src/jsonconnector.h env.o: ../../../morm/src/postgresqlconnector.h @@ -973,8 +983,17 @@ filters.o: ../../../pikotools/convert/patternreplacer.h filters.o: ../../../pikotools/convert/strtoint.h filters.o: ../../../pikotools/convert/text.h htmltextstream.h filters.o: ../../../winix/winixd/core/textstream.h patterncacher.h -filters.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -filters.o: changepatterns.h ../../../winix/winixd/core/cur.h +filters.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +filters.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +filters.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +filters.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +filters.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +filters.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +filters.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +filters.o: ../../../morm/src/fieldvaluehelper.h +filters.o: ../../../morm/src/flatexpression.h +filters.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +filters.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h filters.o: ../../../winix/winixd/core/request.h filters.o: ../../../winix/winixd/core/requesttypes.h filters.o: ../../../winix/winixd/core/error.h @@ -995,16 +1014,8 @@ filters.o: ../../../winix/winixd/core/basethread.h filters.o: ../../../winix/winixd/core/winixmodel.h filters.o: ../../../winix/winixd/core/plugin.h filters.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -filters.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -filters.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -filters.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -filters.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -filters.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -filters.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -filters.o: ../../../morm/src/finderhelper.h -filters.o: ../../../morm/src/fieldvaluehelper.h -filters.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -filters.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +filters.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +filters.o: ../../../morm/src/jsonexpression.h filters.o: ../../../morm/src/postgresqlexpression.h filters.o: ../../../morm/src/jsonconnector.h filters.o: ../../../morm/src/postgresqlconnector.h @@ -1090,8 +1101,17 @@ generic.o: ../../../pikotools/convert/patternreplacer.h generic.o: ../../../pikotools/convert/strtoint.h generic.o: ../../../pikotools/convert/text.h htmltextstream.h generic.o: ../../../winix/winixd/core/textstream.h patterncacher.h -generic.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -generic.o: changepatterns.h ../../../winix/winixd/core/cur.h +generic.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +generic.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +generic.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +generic.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +generic.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +generic.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +generic.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +generic.o: ../../../morm/src/fieldvaluehelper.h +generic.o: ../../../morm/src/flatexpression.h +generic.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +generic.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h generic.o: ../../../winix/winixd/core/request.h generic.o: ../../../winix/winixd/core/requesttypes.h generic.o: ../../../winix/winixd/core/error.h @@ -1112,16 +1132,8 @@ generic.o: ../../../winix/winixd/core/basethread.h generic.o: ../../../winix/winixd/core/winixmodel.h generic.o: ../../../winix/winixd/core/plugin.h generic.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -generic.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -generic.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -generic.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -generic.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -generic.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -generic.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -generic.o: ../../../morm/src/finderhelper.h -generic.o: ../../../morm/src/fieldvaluehelper.h -generic.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -generic.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +generic.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +generic.o: ../../../morm/src/jsonexpression.h generic.o: ../../../morm/src/postgresqlexpression.h generic.o: ../../../morm/src/jsonconnector.h generic.o: ../../../morm/src/postgresqlconnector.h @@ -1272,8 +1284,17 @@ insert.o: ../../../pikotools/convert/patternreplacer.h insert.o: ../../../pikotools/convert/strtoint.h insert.o: ../../../pikotools/convert/text.h htmltextstream.h insert.o: ../../../winix/winixd/core/textstream.h patterncacher.h -insert.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -insert.o: changepatterns.h ../../../winix/winixd/core/cur.h +insert.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +insert.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +insert.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +insert.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +insert.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +insert.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +insert.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +insert.o: ../../../morm/src/fieldvaluehelper.h +insert.o: ../../../morm/src/flatexpression.h +insert.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +insert.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h insert.o: ../../../winix/winixd/core/request.h insert.o: ../../../winix/winixd/core/requesttypes.h insert.o: ../../../winix/winixd/core/error.h @@ -1294,16 +1315,8 @@ insert.o: ../../../winix/winixd/core/basethread.h insert.o: ../../../winix/winixd/core/winixmodel.h insert.o: ../../../winix/winixd/core/plugin.h insert.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -insert.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -insert.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -insert.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -insert.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -insert.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -insert.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -insert.o: ../../../morm/src/finderhelper.h -insert.o: ../../../morm/src/fieldvaluehelper.h -insert.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -insert.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +insert.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +insert.o: ../../../morm/src/jsonexpression.h insert.o: ../../../morm/src/postgresqlexpression.h insert.o: ../../../morm/src/jsonconnector.h insert.o: ../../../morm/src/postgresqlconnector.h @@ -1387,8 +1400,17 @@ ipban.o: ../../../pikotools/convert/patternreplacer.h ipban.o: ../../../pikotools/convert/strtoint.h ipban.o: ../../../pikotools/convert/text.h htmltextstream.h ipban.o: ../../../winix/winixd/core/textstream.h patterncacher.h -ipban.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -ipban.o: changepatterns.h ../../../winix/winixd/core/cur.h +ipban.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +ipban.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +ipban.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +ipban.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +ipban.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +ipban.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +ipban.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +ipban.o: ../../../morm/src/fieldvaluehelper.h +ipban.o: ../../../morm/src/flatexpression.h +ipban.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +ipban.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h ipban.o: ../../../winix/winixd/core/request.h ipban.o: ../../../winix/winixd/core/requesttypes.h ipban.o: ../../../winix/winixd/core/error.h @@ -1408,16 +1430,8 @@ ipban.o: ../../../winix/winixd/core/basethread.h ipban.o: ../../../winix/winixd/core/winixmodel.h ipban.o: ../../../winix/winixd/core/plugin.h ipban.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -ipban.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -ipban.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -ipban.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -ipban.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -ipban.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -ipban.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -ipban.o: ../../../morm/src/finderhelper.h -ipban.o: ../../../morm/src/fieldvaluehelper.h -ipban.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -ipban.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +ipban.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +ipban.o: ../../../morm/src/jsonexpression.h ipban.o: ../../../morm/src/postgresqlexpression.h ipban.o: ../../../morm/src/jsonconnector.h ipban.o: ../../../morm/src/postgresqlconnector.h @@ -1542,7 +1556,16 @@ item.o: ../../../pikotools/convert/patternreplacer.h item.o: ../../../pikotools/convert/strtoint.h item.o: ../../../pikotools/convert/text.h htmltextstream.h item.o: ../../../winix/winixd/core/textstream.h patterncacher.h -item.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +item.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +item.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +item.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +item.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +item.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +item.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +item.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +item.o: ../../../morm/src/fieldvaluehelper.h +item.o: ../../../morm/src/flatexpression.h +item.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h item.o: changepatterns.h ../../../winix/winixd/core/cur.h item.o: ../../../winix/winixd/core/request.h item.o: ../../../winix/winixd/core/requesttypes.h @@ -1562,15 +1585,8 @@ item.o: ../../../winix/winixd/core/basethread.h item.o: ../../../winix/winixd/core/winixmodel.h item.o: ../../../winix/winixd/core/plugin.h item.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -item.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -item.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -item.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -item.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -item.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -item.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -item.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -item.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -item.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +item.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +item.o: ../../../morm/src/jsonexpression.h item.o: ../../../morm/src/postgresqlexpression.h item.o: ../../../morm/src/jsonconnector.h item.o: ../../../morm/src/postgresqlconnector.h @@ -1653,7 +1669,16 @@ last.o: ../../../pikotools/convert/patternreplacer.h last.o: ../../../pikotools/convert/strtoint.h last.o: ../../../pikotools/convert/text.h htmltextstream.h last.o: ../../../winix/winixd/core/textstream.h patterncacher.h -last.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +last.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +last.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +last.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +last.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +last.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +last.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +last.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +last.o: ../../../morm/src/fieldvaluehelper.h +last.o: ../../../morm/src/flatexpression.h +last.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h last.o: changepatterns.h ../../../winix/winixd/core/cur.h last.o: ../../../winix/winixd/core/request.h last.o: ../../../winix/winixd/core/requesttypes.h @@ -1673,15 +1698,8 @@ last.o: ../../../winix/winixd/core/basethread.h last.o: ../../../winix/winixd/core/winixmodel.h last.o: ../../../winix/winixd/core/plugin.h last.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -last.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -last.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -last.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -last.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -last.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -last.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -last.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -last.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -last.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +last.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +last.o: ../../../morm/src/jsonexpression.h last.o: ../../../morm/src/postgresqlexpression.h last.o: ../../../morm/src/jsonconnector.h last.o: ../../../morm/src/postgresqlconnector.h @@ -1836,8 +1854,17 @@ login.o: ../../../pikotools/convert/patternreplacer.h login.o: ../../../pikotools/convert/strtoint.h login.o: ../../../pikotools/convert/text.h htmltextstream.h login.o: ../../../winix/winixd/core/textstream.h patterncacher.h -login.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -login.o: changepatterns.h ../../../winix/winixd/core/cur.h +login.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +login.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +login.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +login.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +login.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +login.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +login.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +login.o: ../../../morm/src/fieldvaluehelper.h +login.o: ../../../morm/src/flatexpression.h +login.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +login.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h login.o: ../../../winix/winixd/core/request.h login.o: ../../../winix/winixd/core/requesttypes.h login.o: ../../../winix/winixd/core/error.h @@ -1857,16 +1884,8 @@ login.o: ../../../winix/winixd/core/basethread.h login.o: ../../../winix/winixd/core/winixmodel.h login.o: ../../../winix/winixd/core/plugin.h login.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -login.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -login.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -login.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -login.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -login.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -login.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -login.o: ../../../morm/src/finderhelper.h -login.o: ../../../morm/src/fieldvaluehelper.h -login.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -login.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +login.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +login.o: ../../../morm/src/jsonexpression.h login.o: ../../../morm/src/postgresqlexpression.h login.o: ../../../morm/src/jsonconnector.h login.o: ../../../morm/src/postgresqlconnector.h @@ -1982,8 +2001,17 @@ ls.o: ../../../winix/winixd/core/synchro.h ls.o: ../../../pikotools/convert/patternreplacer.h ls.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h ls.o: htmltextstream.h ../../../winix/winixd/core/textstream.h -ls.o: patterncacher.h ../../../winix/winixd/core/item.h indexpatterns.h -ls.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h +ls.o: patterncacher.h ../../../winix/winixd/models/item.h +ls.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h +ls.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h +ls.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h +ls.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h +ls.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +ls.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +ls.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h +ls.o: ../../../morm/src/flatexpression.h +ls.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h +ls.o: changepatterns.h ../../../winix/winixd/core/cur.h ls.o: ../../../winix/winixd/core/request.h ls.o: ../../../winix/winixd/core/requesttypes.h ls.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h @@ -2000,15 +2028,8 @@ ls.o: ../../../winix/winixd/core/basethread.h ls.o: ../../../winix/winixd/core/winixmodel.h ls.o: ../../../winix/winixd/core/plugin.h ls.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -ls.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -ls.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -ls.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -ls.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -ls.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -ls.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -ls.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -ls.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -ls.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +ls.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +ls.o: ../../../morm/src/jsonexpression.h ls.o: ../../../morm/src/postgresqlexpression.h ls.o: ../../../morm/src/jsonconnector.h ls.o: ../../../morm/src/postgresqlconnector.h @@ -2079,7 +2100,16 @@ man.o: ../../../pikotools/convert/patternreplacer.h man.o: ../../../pikotools/convert/strtoint.h man.o: ../../../pikotools/convert/text.h htmltextstream.h man.o: ../../../winix/winixd/core/textstream.h patterncacher.h -man.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +man.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +man.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +man.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +man.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +man.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +man.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +man.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +man.o: ../../../morm/src/fieldvaluehelper.h +man.o: ../../../morm/src/flatexpression.h +man.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h man.o: changepatterns.h ../../../winix/winixd/core/cur.h man.o: ../../../winix/winixd/core/request.h man.o: ../../../winix/winixd/core/requesttypes.h @@ -2097,15 +2127,8 @@ man.o: ../../../winix/winixd/core/basethread.h man.o: ../../../winix/winixd/core/winixmodel.h man.o: ../../../winix/winixd/core/plugin.h man.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -man.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -man.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -man.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -man.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -man.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -man.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -man.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -man.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -man.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +man.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +man.o: ../../../morm/src/jsonexpression.h man.o: ../../../morm/src/postgresqlexpression.h man.o: ../../../morm/src/jsonconnector.h man.o: ../../../morm/src/postgresqlconnector.h @@ -2229,7 +2252,16 @@ misc.o: ../../../pikotools/convert/patternreplacer.h misc.o: ../../../pikotools/convert/strtoint.h misc.o: ../../../pikotools/convert/text.h htmltextstream.h misc.o: ../../../winix/winixd/core/textstream.h patterncacher.h -misc.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +misc.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +misc.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +misc.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +misc.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +misc.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +misc.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +misc.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +misc.o: ../../../morm/src/fieldvaluehelper.h +misc.o: ../../../morm/src/flatexpression.h +misc.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h misc.o: changepatterns.h ../../../winix/winixd/core/cur.h misc.o: ../../../winix/winixd/core/request.h misc.o: ../../../winix/winixd/core/requesttypes.h @@ -2249,15 +2281,8 @@ misc.o: ../../../winix/winixd/core/basethread.h misc.o: ../../../winix/winixd/core/winixmodel.h misc.o: ../../../winix/winixd/core/plugin.h misc.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -misc.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -misc.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -misc.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -misc.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -misc.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -misc.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -misc.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -misc.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -misc.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +misc.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +misc.o: ../../../morm/src/jsonexpression.h misc.o: ../../../morm/src/postgresqlexpression.h misc.o: ../../../morm/src/jsonconnector.h misc.o: ../../../morm/src/postgresqlconnector.h @@ -2341,8 +2366,19 @@ miscspace.o: ../../../pikotools/convert/patternreplacer.h miscspace.o: ../../../pikotools/convert/strtoint.h miscspace.o: ../../../pikotools/convert/text.h htmltextstream.h miscspace.o: ../../../winix/winixd/core/textstream.h patterncacher.h -miscspace.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -miscspace.o: changepatterns.h ../../../winix/winixd/core/cur.h +miscspace.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +miscspace.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +miscspace.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +miscspace.o: ../../../morm/src/flatconnector.h +miscspace.o: ../../../morm/src/dbexpression.h +miscspace.o: ../../../morm/src/baseexpression.h +miscspace.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +miscspace.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +miscspace.o: ../../../morm/src/finderhelper.h +miscspace.o: ../../../morm/src/fieldvaluehelper.h +miscspace.o: ../../../morm/src/flatexpression.h +miscspace.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +miscspace.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h miscspace.o: ../../../winix/winixd/core/request.h miscspace.o: ../../../winix/winixd/core/requesttypes.h miscspace.o: ../../../winix/winixd/core/error.h @@ -2363,17 +2399,8 @@ miscspace.o: ../../../winix/winixd/core/basethread.h miscspace.o: ../../../winix/winixd/core/winixmodel.h miscspace.o: ../../../winix/winixd/core/plugin.h miscspace.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -miscspace.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -miscspace.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -miscspace.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -miscspace.o: ../../../morm/src/flatconnector.h -miscspace.o: ../../../morm/src/dbexpression.h -miscspace.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -miscspace.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -miscspace.o: ../../../morm/src/finderhelper.h -miscspace.o: ../../../morm/src/fieldvaluehelper.h -miscspace.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -miscspace.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +miscspace.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +miscspace.o: ../../../morm/src/jsonexpression.h miscspace.o: ../../../morm/src/postgresqlexpression.h miscspace.o: ../../../morm/src/jsonconnector.h miscspace.o: ../../../morm/src/postgresqlconnector.h @@ -2452,8 +2479,17 @@ mount.o: ../../../pikotools/convert/patternreplacer.h mount.o: ../../../pikotools/convert/strtoint.h mount.o: ../../../pikotools/convert/text.h htmltextstream.h mount.o: ../../../winix/winixd/core/textstream.h patterncacher.h -mount.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -mount.o: changepatterns.h ../../../winix/winixd/core/cur.h +mount.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +mount.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +mount.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +mount.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +mount.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +mount.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +mount.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +mount.o: ../../../morm/src/fieldvaluehelper.h +mount.o: ../../../morm/src/flatexpression.h +mount.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +mount.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h mount.o: ../../../winix/winixd/core/request.h mount.o: ../../../winix/winixd/core/requesttypes.h mount.o: ../../../winix/winixd/core/error.h @@ -2473,16 +2509,8 @@ mount.o: ../../../winix/winixd/core/basethread.h mount.o: ../../../winix/winixd/core/winixmodel.h mount.o: ../../../winix/winixd/core/plugin.h mount.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -mount.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -mount.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -mount.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -mount.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -mount.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -mount.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -mount.o: ../../../morm/src/finderhelper.h -mount.o: ../../../morm/src/fieldvaluehelper.h -mount.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -mount.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +mount.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +mount.o: ../../../morm/src/jsonexpression.h mount.o: ../../../morm/src/postgresqlexpression.h mount.o: ../../../morm/src/jsonconnector.h mount.o: ../../../morm/src/postgresqlconnector.h @@ -2566,8 +2594,17 @@ passwd.o: ../../../pikotools/convert/patternreplacer.h passwd.o: ../../../pikotools/convert/strtoint.h passwd.o: ../../../pikotools/convert/text.h htmltextstream.h passwd.o: ../../../winix/winixd/core/textstream.h patterncacher.h -passwd.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -passwd.o: changepatterns.h ../../../winix/winixd/core/cur.h +passwd.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +passwd.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +passwd.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +passwd.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +passwd.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +passwd.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +passwd.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +passwd.o: ../../../morm/src/fieldvaluehelper.h +passwd.o: ../../../morm/src/flatexpression.h +passwd.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +passwd.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h passwd.o: ../../../winix/winixd/core/request.h passwd.o: ../../../winix/winixd/core/requesttypes.h passwd.o: ../../../winix/winixd/core/error.h @@ -2588,16 +2625,8 @@ passwd.o: ../../../winix/winixd/core/basethread.h passwd.o: ../../../winix/winixd/core/winixmodel.h passwd.o: ../../../winix/winixd/core/plugin.h passwd.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -passwd.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -passwd.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -passwd.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -passwd.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -passwd.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -passwd.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -passwd.o: ../../../morm/src/finderhelper.h -passwd.o: ../../../morm/src/fieldvaluehelper.h -passwd.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -passwd.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +passwd.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +passwd.o: ../../../morm/src/jsonexpression.h passwd.o: ../../../morm/src/postgresqlexpression.h passwd.o: ../../../morm/src/jsonconnector.h passwd.o: ../../../morm/src/postgresqlconnector.h @@ -2647,14 +2676,14 @@ passwd.o: ../../../winix/winixd/core/htmlfilter.h passwd.o: ../../../winix/winixd/core/winixrequest.h passwd.o: ../../../winix/winixd/core/winixsystem.h passwd.o: ../../../winix/winixd/core/slog.h -patterncacher.o: patterncacher.h ../../../winix/winixd/core/item.h +patterncacher.o: patterncacher.h misc.h localefilter.h locale.h +patterncacher.o: ../../../pikotools/space/spaceparser.h +patterncacher.o: ../../../pikotools/space/space.h +patterncacher.o: ../../../pikotools/textstream/textstream.h patterncacher.o: ../../../pikotools/space/space.h patterncacher.o: ../../../pikotools/textstream/types.h patterncacher.o: ../../../pikotools/date/date.h -patterncacher.o: ../../../pikotools/convert/inttostr.h misc.h localefilter.h -patterncacher.o: locale.h ../../../pikotools/space/spaceparser.h -patterncacher.o: ../../../pikotools/space/space.h -patterncacher.o: ../../../pikotools/textstream/textstream.h +patterncacher.o: ../../../pikotools/convert/inttostr.h patterncacher.o: ../../../pikotools/membuffer/membuffer.h patterncacher.o: ../../../pikotools/textstream/types.h patterncacher.o: ../../../winix/winixd/core/winixbase.h @@ -2679,6 +2708,20 @@ patterncacher.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h patterncacher.o: ../../../ezc/src/expressionparser.h patterncacher.o: ../../../ezc/src/patternparser.h htmltextstream.h patterncacher.o: ../../../winix/winixd/core/textstream.h +patterncacher.o: ../../../winix/winixd/models/item.h +patterncacher.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h +patterncacher.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h +patterncacher.o: ../../../morm/src/queryresult.h +patterncacher.o: ../../../morm/src/flatconnector.h +patterncacher.o: ../../../morm/src/dbexpression.h +patterncacher.o: ../../../morm/src/baseexpression.h +patterncacher.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +patterncacher.o: ../../../morm/src/modeldata.h +patterncacher.o: ../../../morm/src/cursorhelper.h +patterncacher.o: ../../../morm/src/finderhelper.h +patterncacher.o: ../../../morm/src/fieldvaluehelper.h +patterncacher.o: ../../../morm/src/flatexpression.h +patterncacher.o: ../../../winix/winixd/models/itemcontent.h patterns.o: patterns.h locale.h ../../../pikotools/space/spaceparser.h patterns.o: ../../../pikotools/space/space.h patterns.o: ../../../pikotools/textstream/textstream.h @@ -2736,7 +2779,16 @@ priv.o: ../../../pikotools/convert/patternreplacer.h priv.o: ../../../pikotools/convert/strtoint.h priv.o: ../../../pikotools/convert/text.h htmltextstream.h priv.o: ../../../winix/winixd/core/textstream.h patterncacher.h -priv.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +priv.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +priv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +priv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +priv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +priv.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +priv.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +priv.o: ../../../morm/src/fieldvaluehelper.h +priv.o: ../../../morm/src/flatexpression.h +priv.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h priv.o: changepatterns.h ../../../winix/winixd/core/cur.h priv.o: ../../../winix/winixd/core/request.h priv.o: ../../../winix/winixd/core/requesttypes.h @@ -2756,15 +2808,8 @@ priv.o: ../../../winix/winixd/core/basethread.h priv.o: ../../../winix/winixd/core/winixmodel.h priv.o: ../../../winix/winixd/core/plugin.h priv.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -priv.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -priv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -priv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -priv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -priv.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -priv.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -priv.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -priv.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +priv.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +priv.o: ../../../morm/src/jsonexpression.h priv.o: ../../../morm/src/postgresqlexpression.h priv.o: ../../../morm/src/jsonconnector.h priv.o: ../../../morm/src/postgresqlconnector.h @@ -2891,8 +2936,17 @@ rebus.o: ../../../pikotools/convert/patternreplacer.h rebus.o: ../../../pikotools/convert/strtoint.h rebus.o: ../../../pikotools/convert/text.h htmltextstream.h rebus.o: ../../../winix/winixd/core/textstream.h patterncacher.h -rebus.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -rebus.o: changepatterns.h ../../../winix/winixd/core/cur.h +rebus.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +rebus.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +rebus.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +rebus.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +rebus.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +rebus.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +rebus.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +rebus.o: ../../../morm/src/fieldvaluehelper.h +rebus.o: ../../../morm/src/flatexpression.h +rebus.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +rebus.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h rebus.o: ../../../winix/winixd/core/request.h rebus.o: ../../../winix/winixd/core/requesttypes.h rebus.o: ../../../winix/winixd/core/error.h @@ -2912,16 +2966,8 @@ rebus.o: ../../../winix/winixd/core/basethread.h rebus.o: ../../../winix/winixd/core/winixmodel.h rebus.o: ../../../winix/winixd/core/plugin.h rebus.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -rebus.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -rebus.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -rebus.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -rebus.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -rebus.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -rebus.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -rebus.o: ../../../morm/src/finderhelper.h -rebus.o: ../../../morm/src/fieldvaluehelper.h -rebus.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -rebus.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +rebus.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +rebus.o: ../../../morm/src/jsonexpression.h rebus.o: ../../../morm/src/postgresqlexpression.h rebus.o: ../../../morm/src/jsonconnector.h rebus.o: ../../../morm/src/postgresqlconnector.h @@ -2999,8 +3045,17 @@ server.o: ../../../pikotools/convert/patternreplacer.h server.o: ../../../pikotools/convert/strtoint.h server.o: ../../../pikotools/convert/text.h htmltextstream.h server.o: ../../../winix/winixd/core/textstream.h patterncacher.h -server.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -server.o: changepatterns.h ../../../winix/winixd/core/cur.h +server.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +server.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +server.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +server.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +server.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +server.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +server.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +server.o: ../../../morm/src/fieldvaluehelper.h +server.o: ../../../morm/src/flatexpression.h +server.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +server.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h server.o: ../../../winix/winixd/core/request.h server.o: ../../../winix/winixd/core/requesttypes.h server.o: ../../../winix/winixd/core/error.h @@ -3021,16 +3076,8 @@ server.o: ../../../winix/winixd/core/basethread.h server.o: ../../../winix/winixd/core/winixmodel.h server.o: ../../../winix/winixd/core/plugin.h server.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -server.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -server.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -server.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -server.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -server.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -server.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -server.o: ../../../morm/src/finderhelper.h -server.o: ../../../morm/src/fieldvaluehelper.h -server.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -server.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +server.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +server.o: ../../../morm/src/jsonexpression.h server.o: ../../../morm/src/postgresqlexpression.h server.o: ../../../morm/src/jsonconnector.h server.o: ../../../morm/src/postgresqlconnector.h @@ -3155,7 +3202,16 @@ slog.o: ../../../pikotools/convert/patternreplacer.h slog.o: ../../../pikotools/convert/strtoint.h slog.o: ../../../pikotools/convert/text.h htmltextstream.h slog.o: ../../../winix/winixd/core/textstream.h patterncacher.h -slog.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +slog.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +slog.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +slog.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +slog.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +slog.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +slog.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +slog.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +slog.o: ../../../morm/src/fieldvaluehelper.h +slog.o: ../../../morm/src/flatexpression.h +slog.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h slog.o: changepatterns.h ../../../winix/winixd/core/cur.h slog.o: ../../../winix/winixd/core/request.h slog.o: ../../../winix/winixd/core/requesttypes.h @@ -3175,15 +3231,8 @@ slog.o: ../../../winix/winixd/core/basethread.h slog.o: ../../../winix/winixd/core/winixmodel.h slog.o: ../../../winix/winixd/core/plugin.h slog.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -slog.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -slog.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -slog.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -slog.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -slog.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -slog.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -slog.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -slog.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -slog.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +slog.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +slog.o: ../../../morm/src/jsonexpression.h slog.o: ../../../morm/src/postgresqlexpression.h slog.o: ../../../morm/src/jsonconnector.h slog.o: ../../../morm/src/postgresqlconnector.h @@ -3256,7 +3305,16 @@ stat.o: ../../../pikotools/convert/patternreplacer.h stat.o: ../../../pikotools/convert/strtoint.h stat.o: ../../../pikotools/convert/text.h htmltextstream.h stat.o: ../../../winix/winixd/core/textstream.h patterncacher.h -stat.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +stat.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +stat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +stat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +stat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +stat.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +stat.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +stat.o: ../../../morm/src/fieldvaluehelper.h +stat.o: ../../../morm/src/flatexpression.h +stat.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h stat.o: changepatterns.h ../../../winix/winixd/core/cur.h stat.o: ../../../winix/winixd/core/request.h stat.o: ../../../winix/winixd/core/requesttypes.h @@ -3276,15 +3334,8 @@ stat.o: ../../../winix/winixd/core/basethread.h stat.o: ../../../winix/winixd/core/winixmodel.h stat.o: ../../../winix/winixd/core/plugin.h stat.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -stat.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -stat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -stat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -stat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -stat.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -stat.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -stat.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -stat.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +stat.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +stat.o: ../../../morm/src/jsonexpression.h stat.o: ../../../morm/src/postgresqlexpression.h stat.o: ../../../morm/src/jsonconnector.h stat.o: ../../../morm/src/postgresqlconnector.h @@ -3363,7 +3414,16 @@ sys.o: ../../../pikotools/convert/patternreplacer.h sys.o: ../../../pikotools/convert/strtoint.h sys.o: ../../../pikotools/convert/text.h htmltextstream.h sys.o: ../../../winix/winixd/core/textstream.h patterncacher.h -sys.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +sys.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +sys.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +sys.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +sys.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +sys.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +sys.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +sys.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +sys.o: ../../../morm/src/fieldvaluehelper.h +sys.o: ../../../morm/src/flatexpression.h +sys.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h sys.o: changepatterns.h ../../../winix/winixd/core/cur.h sys.o: ../../../winix/winixd/core/request.h sys.o: ../../../winix/winixd/core/requesttypes.h @@ -3381,15 +3441,8 @@ sys.o: ../../../winix/winixd/core/basethread.h sys.o: ../../../winix/winixd/core/winixmodel.h sys.o: ../../../winix/winixd/core/plugin.h sys.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -sys.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -sys.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -sys.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -sys.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -sys.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -sys.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -sys.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -sys.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -sys.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +sys.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +sys.o: ../../../morm/src/jsonexpression.h sys.o: ../../../morm/src/postgresqlexpression.h sys.o: ../../../morm/src/jsonconnector.h sys.o: ../../../morm/src/postgresqlconnector.h @@ -3468,8 +3521,18 @@ template.o: ../../../pikotools/convert/patternreplacer.h template.o: ../../../pikotools/convert/strtoint.h template.o: ../../../pikotools/convert/text.h htmltextstream.h template.o: ../../../winix/winixd/core/textstream.h patterncacher.h -template.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -template.o: changepatterns.h ../../../winix/winixd/core/cur.h +template.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +template.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +template.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +template.o: ../../../morm/src/flatconnector.h +template.o: ../../../morm/src/dbexpression.h +template.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +template.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +template.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +template.o: ../../../morm/src/fieldvaluehelper.h +template.o: ../../../morm/src/flatexpression.h +template.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +template.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h template.o: ../../../winix/winixd/core/request.h template.o: ../../../winix/winixd/core/requesttypes.h template.o: ../../../winix/winixd/core/error.h @@ -3490,17 +3553,8 @@ template.o: ../../../winix/winixd/core/basethread.h template.o: ../../../winix/winixd/core/winixmodel.h template.o: ../../../winix/winixd/core/plugin.h template.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -template.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -template.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -template.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -template.o: ../../../morm/src/flatconnector.h -template.o: ../../../morm/src/dbexpression.h -template.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -template.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -template.o: ../../../morm/src/finderhelper.h -template.o: ../../../morm/src/fieldvaluehelper.h -template.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -template.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +template.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +template.o: ../../../morm/src/jsonexpression.h template.o: ../../../morm/src/postgresqlexpression.h template.o: ../../../morm/src/jsonconnector.h template.o: ../../../morm/src/postgresqlconnector.h @@ -3587,8 +3641,19 @@ templates.o: ../../../pikotools/convert/patternreplacer.h templates.o: ../../../pikotools/convert/strtoint.h templates.o: ../../../pikotools/convert/text.h htmltextstream.h templates.o: ../../../winix/winixd/core/textstream.h patterncacher.h -templates.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -templates.o: changepatterns.h ../../../winix/winixd/core/cur.h +templates.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +templates.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +templates.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +templates.o: ../../../morm/src/flatconnector.h +templates.o: ../../../morm/src/dbexpression.h +templates.o: ../../../morm/src/baseexpression.h +templates.o: ../../../morm/src/morm_types.h ../../../morm/src/modelenv.h +templates.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h +templates.o: ../../../morm/src/finderhelper.h +templates.o: ../../../morm/src/fieldvaluehelper.h +templates.o: ../../../morm/src/flatexpression.h +templates.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +templates.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h templates.o: ../../../winix/winixd/core/request.h templates.o: ../../../winix/winixd/core/requesttypes.h templates.o: ../../../winix/winixd/core/error.h @@ -3609,17 +3674,8 @@ templates.o: ../../../winix/winixd/core/basethread.h templates.o: ../../../winix/winixd/core/winixmodel.h templates.o: ../../../winix/winixd/core/plugin.h templates.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -templates.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -templates.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -templates.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -templates.o: ../../../morm/src/flatconnector.h -templates.o: ../../../morm/src/dbexpression.h -templates.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -templates.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -templates.o: ../../../morm/src/finderhelper.h -templates.o: ../../../morm/src/fieldvaluehelper.h -templates.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -templates.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +templates.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +templates.o: ../../../morm/src/jsonexpression.h templates.o: ../../../morm/src/postgresqlexpression.h templates.o: ../../../morm/src/jsonconnector.h templates.o: ../../../morm/src/postgresqlconnector.h @@ -3784,8 +3840,17 @@ upload.o: ../../../pikotools/convert/patternreplacer.h upload.o: ../../../pikotools/convert/strtoint.h upload.o: ../../../pikotools/convert/text.h htmltextstream.h upload.o: ../../../winix/winixd/core/textstream.h patterncacher.h -upload.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -upload.o: changepatterns.h ../../../winix/winixd/core/cur.h +upload.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +upload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +upload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +upload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +upload.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +upload.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +upload.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +upload.o: ../../../morm/src/fieldvaluehelper.h +upload.o: ../../../morm/src/flatexpression.h +upload.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +upload.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h upload.o: ../../../winix/winixd/core/request.h upload.o: ../../../winix/winixd/core/requesttypes.h upload.o: ../../../winix/winixd/core/error.h @@ -3806,16 +3871,8 @@ upload.o: ../../../winix/winixd/core/basethread.h upload.o: ../../../winix/winixd/core/winixmodel.h upload.o: ../../../winix/winixd/core/plugin.h upload.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -upload.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -upload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -upload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -upload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -upload.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -upload.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -upload.o: ../../../morm/src/finderhelper.h -upload.o: ../../../morm/src/fieldvaluehelper.h -upload.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -upload.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +upload.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +upload.o: ../../../morm/src/jsonexpression.h upload.o: ../../../morm/src/postgresqlexpression.h upload.o: ../../../morm/src/jsonconnector.h upload.o: ../../../morm/src/postgresqlconnector.h @@ -3895,8 +3952,17 @@ uptime.o: ../../../pikotools/convert/patternreplacer.h uptime.o: ../../../pikotools/convert/strtoint.h uptime.o: ../../../pikotools/convert/text.h htmltextstream.h uptime.o: ../../../winix/winixd/core/textstream.h patterncacher.h -uptime.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -uptime.o: changepatterns.h ../../../winix/winixd/core/cur.h +uptime.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +uptime.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +uptime.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +uptime.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +uptime.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +uptime.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +uptime.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +uptime.o: ../../../morm/src/fieldvaluehelper.h +uptime.o: ../../../morm/src/flatexpression.h +uptime.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +uptime.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h uptime.o: ../../../winix/winixd/core/request.h uptime.o: ../../../winix/winixd/core/requesttypes.h uptime.o: ../../../winix/winixd/core/error.h @@ -3917,16 +3983,8 @@ uptime.o: ../../../winix/winixd/core/basethread.h uptime.o: ../../../winix/winixd/core/winixmodel.h uptime.o: ../../../winix/winixd/core/plugin.h uptime.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -uptime.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -uptime.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -uptime.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -uptime.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -uptime.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -uptime.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -uptime.o: ../../../morm/src/finderhelper.h -uptime.o: ../../../morm/src/fieldvaluehelper.h -uptime.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -uptime.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +uptime.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +uptime.o: ../../../morm/src/jsonexpression.h uptime.o: ../../../morm/src/postgresqlexpression.h uptime.o: ../../../morm/src/jsonconnector.h uptime.o: ../../../morm/src/postgresqlconnector.h @@ -4003,7 +4061,16 @@ user.o: ../../../pikotools/convert/patternreplacer.h user.o: ../../../pikotools/convert/strtoint.h user.o: ../../../pikotools/convert/text.h htmltextstream.h user.o: ../../../winix/winixd/core/textstream.h patterncacher.h -user.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +user.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +user.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +user.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +user.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +user.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +user.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +user.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +user.o: ../../../morm/src/fieldvaluehelper.h +user.o: ../../../morm/src/flatexpression.h +user.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h user.o: changepatterns.h ../../../winix/winixd/core/cur.h user.o: ../../../winix/winixd/core/request.h user.o: ../../../winix/winixd/core/requesttypes.h @@ -4023,15 +4090,8 @@ user.o: ../../../winix/winixd/core/basethread.h user.o: ../../../winix/winixd/core/winixmodel.h user.o: ../../../winix/winixd/core/plugin.h user.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -user.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -user.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -user.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -user.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -user.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -user.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -user.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -user.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -user.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +user.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +user.o: ../../../morm/src/jsonexpression.h user.o: ../../../morm/src/postgresqlexpression.h user.o: ../../../morm/src/jsonconnector.h user.o: ../../../morm/src/postgresqlconnector.h @@ -4110,7 +4170,16 @@ who.o: ../../../pikotools/convert/patternreplacer.h who.o: ../../../pikotools/convert/strtoint.h who.o: ../../../pikotools/convert/text.h htmltextstream.h who.o: ../../../winix/winixd/core/textstream.h patterncacher.h -who.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h +who.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +who.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +who.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +who.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +who.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +who.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +who.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +who.o: ../../../morm/src/fieldvaluehelper.h +who.o: ../../../morm/src/flatexpression.h +who.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h patterns.h who.o: changepatterns.h ../../../winix/winixd/core/cur.h who.o: ../../../winix/winixd/core/request.h who.o: ../../../winix/winixd/core/requesttypes.h @@ -4128,15 +4197,8 @@ who.o: ../../../winix/winixd/core/basethread.h who.o: ../../../winix/winixd/core/winixmodel.h who.o: ../../../winix/winixd/core/plugin.h who.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -who.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -who.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -who.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -who.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -who.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -who.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -who.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h -who.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -who.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +who.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +who.o: ../../../morm/src/jsonexpression.h who.o: ../../../morm/src/postgresqlexpression.h who.o: ../../../morm/src/jsonconnector.h who.o: ../../../morm/src/postgresqlconnector.h @@ -4217,8 +4279,17 @@ winix.o: ../../../pikotools/convert/patternreplacer.h winix.o: ../../../pikotools/convert/strtoint.h winix.o: ../../../pikotools/convert/text.h htmltextstream.h winix.o: ../../../winix/winixd/core/textstream.h patterncacher.h -winix.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h -winix.o: changepatterns.h ../../../winix/winixd/core/cur.h +winix.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h +winix.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h +winix.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h +winix.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h +winix.o: ../../../morm/src/baseexpression.h ../../../morm/src/morm_types.h +winix.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h +winix.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h +winix.o: ../../../morm/src/fieldvaluehelper.h +winix.o: ../../../morm/src/flatexpression.h +winix.o: ../../../winix/winixd/models/itemcontent.h indexpatterns.h +winix.o: patterns.h changepatterns.h ../../../winix/winixd/core/cur.h winix.o: ../../../winix/winixd/core/request.h winix.o: ../../../winix/winixd/core/requesttypes.h winix.o: ../../../winix/winixd/core/error.h @@ -4238,16 +4309,8 @@ winix.o: ../../../winix/winixd/core/basethread.h winix.o: ../../../winix/winixd/core/winixmodel.h winix.o: ../../../winix/winixd/core/plugin.h winix.o: ../../../winix/winixd/core/pluginmsg.h ../../../morm/src/morm.h -winix.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h -winix.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h -winix.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h -winix.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h -winix.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h -winix.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h -winix.o: ../../../morm/src/finderhelper.h -winix.o: ../../../morm/src/fieldvaluehelper.h -winix.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h -winix.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h +winix.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h +winix.o: ../../../morm/src/jsonexpression.h winix.o: ../../../morm/src/postgresqlexpression.h winix.o: ../../../morm/src/jsonconnector.h winix.o: ../../../morm/src/postgresqlconnector.h diff --git a/winixd/templates/dir.cpp b/winixd/templates/dir.cpp index 6e3fd74..759011b 100644 --- a/winixd/templates/dir.cpp +++ b/winixd/templates/dir.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -258,7 +258,7 @@ void dir_childs_tab_url(Info & i) void dir_childs_tab_privileges(Info & i) { if( dir_childs_index < dir_childs_table.size() ) - i.out << "0" << Toa(dir_childs_table[dir_childs_index]->privileges, 8); + i.out << "0" << Toa(dir_childs_table[dir_childs_index]->item_content.privileges, 8); } @@ -266,7 +266,7 @@ void dir_childs_tab_user(Info & i) { if( dir_childs_index < dir_childs_table.size() ) { - long user_id = dir_childs_table[dir_childs_index]->user_id; + long user_id = dir_childs_table[dir_childs_index]->item_content.user_id; User * puser = system->users.GetUser(user_id); if( puser ) @@ -275,8 +275,8 @@ void dir_childs_tab_user(Info & i) { i.out << "~"; - if( !dir_childs_table[dir_childs_index]->guest_name.empty() ) - i.out << dir_childs_table[dir_childs_index]->guest_name; + if( !dir_childs_table[dir_childs_index]->item_content.guest_name.empty() ) + i.out << dir_childs_table[dir_childs_index]->item_content.guest_name; else i.out << "guest"; // !! dodac do konfiga } @@ -289,7 +289,7 @@ void dir_childs_tab_group(Info & i) { if( dir_childs_index < dir_childs_table.size() ) { - long group_id = dir_childs_table[dir_childs_index]->group_id; + long group_id = dir_childs_table[dir_childs_index]->item_content.group_id; Group * pgroup = system->groups.GetGroup(group_id); if( pgroup ) @@ -349,13 +349,13 @@ void dir_tab_subject(Info & i) void dir_last_link_to(Info & i) { - i.out << cur->request->dir_tab.back()->link_to; + i.out << cur->request->dir_tab.back()->item_content.link_to; } void dir_last_is_link_redirect(Info & i) { - i.res = cur->request->dir_tab.back()->link_redirect == 1; + i.res = cur->request->dir_tab.back()->item_content.link_redirect == 1; } @@ -367,7 +367,7 @@ void dir_last_subject(Info & i) void dir_last_user(Info & i) { - User * puser = system->users.GetUser(cur->request->dir_tab.back()->user_id); + User * puser = system->users.GetUser(cur->request->dir_tab.back()->item_content.user_id); if( puser ) i.out << puser->name; @@ -375,8 +375,8 @@ void dir_last_user(Info & i) { i.out << "~"; - if( !cur->request->dir_tab.back()->guest_name.empty() ) - i.out << cur->request->dir_tab.back()->guest_name; + if( !cur->request->dir_tab.back()->item_content.guest_name.empty() ) + i.out << cur->request->dir_tab.back()->item_content.guest_name; else i.out << "guest"; // !! dodac do konfiga } @@ -402,35 +402,35 @@ void dir_last_url_is_no(Info & i) void dir_last_date_creation(Info & i) { - PT::Date date = system->ToLocal(cur->request->dir_tab.back()->date_creation); + PT::Date date = system->ToLocal(cur->request->dir_tab.back()->item_content.date_creation); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } void dir_last_date_modification(Info & i) { - PT::Date date = system->ToLocal(cur->request->dir_tab.back()->date_modification); + PT::Date date = system->ToLocal(cur->request->dir_tab.back()->item_content.date_modification); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } void dir_last_date_creation_nice(Info & i) { - print_date_nice(i, cur->request->dir_tab.back()->date_creation); + print_date_nice(i, cur->request->dir_tab.back()->item_content.date_creation); } void dir_last_date_modification_nice(Info & i) { - print_date_nice(i, cur->request->dir_tab.back()->date_modification); + print_date_nice(i, cur->request->dir_tab.back()->item_content.date_modification); } void dir_last_dates_equal(Info & i) { - PT::Date & date1 = cur->request->dir_tab.back()->date_creation; - PT::Date & date2 = cur->request->dir_tab.back()->date_modification; + PT::Date & date1 = cur->request->dir_tab.back()->item_content.date_creation; + PT::Date & date2 = cur->request->dir_tab.back()->item_content.date_modification; i.res = date1 == date2; } @@ -438,14 +438,14 @@ void dir_last_dates_equal(Info & i) void dir_last_users_different(Info & i) { - i.res = (cur->request->dir_tab.back()->user_id != cur->request->dir_tab.back()->modification_user_id); + i.res = (cur->request->dir_tab.back()->item_content.user_id != cur->request->dir_tab.back()->item_content.modification_user_id); } void dir_last_modification_user(Info & i) { - User * puser = system->users.GetUser(cur->request->dir_tab.back()->modification_user_id); - print_user_name(i, puser, cur->request->dir_tab.back()->guest_name); + User * puser = system->users.GetUser(cur->request->dir_tab.back()->item_content.modification_user_id); + print_user_name(i, puser, cur->request->dir_tab.back()->item_content.guest_name); } @@ -464,32 +464,32 @@ void dir_last_has_html_template(Info & i) void dir_last_meta_str(Info & i) { - cur->request->dir_tab.back()->meta.Serialize(i.out, true, false); + cur->request->dir_tab.back()->item_content.meta.Serialize(i.out, true, false); } void dir_last_meta(Info & i) { - space_value(i, cur->request->dir_tab.back()->meta); + space_value(i, cur->request->dir_tab.back()->item_content.meta); } void dir_last_meta_tab(Info & i) { - space_list_tab(i, cur->request->dir_tab.back()->meta); + space_list_tab(i, cur->request->dir_tab.back()->item_content.meta); } void dir_last_meta_tab_value(Info & i) { - space_list_tab_value(i, cur->request->dir_tab.back()->meta, L"dir_last_meta_tab"); + space_list_tab_value(i, cur->request->dir_tab.back()->item_content.meta, L"dir_last_meta_tab"); } void dir_last_meta_tab_has_next(Info & i) { - space_list_tab_has_next(i, cur->request->dir_tab.back()->meta, L"dir_last_meta_tab"); + space_list_tab_has_next(i, cur->request->dir_tab.back()->item_content.meta, L"dir_last_meta_tab"); } @@ -497,31 +497,31 @@ void dir_last_meta_tab_has_next(Info & i) void dir_last_admin_meta_str(Info & i) { - cur->request->dir_tab.back()->ameta.Serialize(i.out, true, false); + cur->request->dir_tab.back()->item_content.meta_admin.Serialize(i.out, true, false); } void dir_last_admin_meta(Info & i) { - space_value(i, cur->request->dir_tab.back()->ameta); + space_value(i, cur->request->dir_tab.back()->item_content.meta_admin); } void dir_last_admin_meta_tab(Info & i) { - space_list_tab(i, cur->request->dir_tab.back()->ameta); + space_list_tab(i, cur->request->dir_tab.back()->item_content.meta_admin); } void dir_last_admin_meta_tab_value(Info & i) { - space_list_tab_value(i, cur->request->dir_tab.back()->ameta, L"dir_last_admin_meta_tab"); + space_list_tab_value(i, cur->request->dir_tab.back()->item_content.meta_admin, L"dir_last_admin_meta_tab"); } void dir_last_admin_meta_tab_has_next(Info & i) { - space_list_tab_has_next(i, cur->request->dir_tab.back()->ameta, L"dir_last_admin_meta_tab"); + space_list_tab_has_next(i, cur->request->dir_tab.back()->item_content.meta_admin, L"dir_last_admin_meta_tab"); } diff --git a/winixd/templates/insert.cpp b/winixd/templates/insert.cpp index f29543f..690df7d 100644 --- a/winixd/templates/insert.cpp +++ b/winixd/templates/insert.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,7 +77,7 @@ void insert_page_run(Info & i) InitGenerator(info.ezc_gen); info.ezc_gen.SetPattern(*pat); info.ezc_gen.Generate(info.run_content); - item_print_content(i.out, info.run_content.Str(), info.item.content_type); + item_print_content(i.out, info.run_content.Str(), info.item.item_content.content_raw_type); insert_page_cur -= 1; } @@ -119,7 +119,7 @@ void insert_page(Info & i) insert_page_run(i); else if( system->HasReadAccess(info.item) ) - item_print_content(i.out, info.item.content, info.item.content_type); + item_print_content(i.out, info.item.item_content.content_raw, info.item.item_content.content_raw_type); } } diff --git a/winixd/templates/item.cpp b/winixd/templates/item.cpp index 4e55923..0eac54a 100644 --- a/winixd/templates/item.cpp +++ b/winixd/templates/item.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -88,14 +88,14 @@ void item_subject_noescape(Info & i) void item_content(Info & i) { - i.out << cur->request->last_item->content; + i.out << cur->request->last_item->item_content.content_raw; } void item_content_noescape(Info & i) { - i.out << R(cur->request->last_item->content); + i.out << R(cur->request->last_item->item_content.content_raw); } @@ -103,19 +103,19 @@ void item_content_type_is(Item & item, Info & i) { i.res = false; - if( item.content_type == Item::ct_text && i.par == L"text" ) + if( item.item_content.content_raw_type == ItemContent::ct_text && i.par == L"text" ) i.res = true; else - if( item.content_type == Item::ct_formatted_text && i.par == L"formatted text" ) + if( item.item_content.content_raw_type == ItemContent::ct_formatted_text && i.par == L"formatted text" ) i.res = true; else - if( item.content_type == Item::ct_html && i.par == L"html" ) + if( item.item_content.content_raw_type == ItemContent::ct_html && i.par == L"html" ) i.res = true; else - if( item.content_type == Item::ct_bbcode && i.par == L"bbcode" ) + if( item.item_content.content_raw_type == ItemContent::ct_bbcode && i.par == L"bbcode" ) i.res = true; else - if( item.content_type == Item::ct_other && i.par == L"other" ) + if( item.item_content.content_raw_type == ItemContent::ct_other && i.par == L"other" ) i.res = true; } @@ -126,22 +126,22 @@ void item_content_type_is(Info & i) } -void item_print_content(HtmlTextStream & out, const std::wstring & content, Item::ContentType content_type) +void item_print_content(HtmlTextStream & out, const std::wstring & content, ItemContent::ContentType content_type) { - if( config->html_filter && !Item::CanContentBeHtmlFiltered(content_type) ) + if( config->html_filter && !ItemContent::CanContentBeHtmlFiltered(content_type) ) out << R(""); - if( content_type == Item::ct_text ) + if( content_type == ItemContent::ct_text ) { out << content; } else - if( content_type == Item::ct_formatted_text ) + if( content_type == ItemContent::ct_formatted_text ) { HtmlEscapeFormTxt(out, content); } else - if( content_type == Item::ct_bbcode ) + if( content_type == ItemContent::ct_bbcode ) { static std::wstring out_temp; out_temp.clear(); @@ -156,26 +156,26 @@ void item_print_content(HtmlTextStream & out, const std::wstring & content, Item out << R(content); } - if( config->html_filter && !Item::CanContentBeHtmlFiltered(content_type) ) + if( config->html_filter && !ItemContent::CanContentBeHtmlFiltered(content_type) ) out << R(""); } void item_content_is_empty(Info & i) { - i.res = cur->request->last_item->content.empty(); + i.res = cur->request->last_item->item_content.content_raw.empty(); } void item_print_content(Info & i) { - item_print_content(i.out, cur->request->last_item->content, cur->request->last_item->content_type); + item_print_content(i.out, cur->request->last_item->item_content.content_raw, cur->request->last_item->item_content.content_raw_type); } void item_privileges(Info & i) { - i.out << Toa(cur->request->last_item->privileges, 8); + i.out << Toa(cur->request->last_item->item_content.privileges, 8); } @@ -193,19 +193,13 @@ void item_url(Info & i) void item_url_is(Info & i) { - if( !cur->request->is_item ) - return; // default false - i.res = (cur->request->last_item->url == i.par); } void item_url_is_no(Info & i) { - if( !cur->request->is_item ) - i.res = true; - else - i.res = (cur->request->last_item->url != i.par); + i.res = (cur->request->last_item->url != i.par); } @@ -226,25 +220,25 @@ void item_link(Info & i) void item_filetype_is_none(Info & i) { - i.res = cur->request->last_item->file_type == WINIX_ITEM_FILETYPE_NONE; + i.res = cur->request->last_item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE; } void item_filetype_is_image(Info & i) { - i.res = cur->request->last_item->file_type == WINIX_ITEM_FILETYPE_IMAGE; + i.res = cur->request->last_item->item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE; } void item_has_static_file(Info & i) { - i.res = cur->request->last_item->file_type != WINIX_ITEM_FILETYPE_NONE && !cur->request->last_item->file_path.empty(); + i.res = cur->request->last_item->item_content.file_type != WINIX_ITEM_FILETYPE_NONE && !cur->request->last_item->item_content.file_path.empty(); } void item_has_thumb(Info & i) { - i.res = cur->request->last_item->has_thumb; + i.res = cur->request->last_item->item_content.file_has_thumb; } @@ -270,55 +264,55 @@ void item_can_remove(Info & i) void item_user(Info & i) { - User * puser = system->users.GetUser(cur->request->last_item->user_id); - print_user_name(i, puser, cur->request->last_item->guest_name); + User * puser = system->users.GetUser(cur->request->last_item->item_content.user_id); + print_user_name(i, puser, cur->request->last_item->item_content.guest_name); } void item_modification_user(Info & i) { - User * puser = system->users.GetUser(cur->request->last_item->modification_user_id); - print_user_name(i, puser, cur->request->last_item->guest_name); + User * puser = system->users.GetUser(cur->request->last_item->item_content.modification_user_id); + print_user_name(i, puser, cur->request->last_item->item_content.guest_name); } void item_users_different(Info & i) { - i.res = (cur->request->last_item->user_id != cur->request->last_item->modification_user_id); + i.res = (cur->request->last_item->item_content.user_id != cur->request->last_item->item_content.modification_user_id); } void item_date_creation(Info & i) { - PT::Date date = system->ToLocal(cur->request->last_item->date_creation); + PT::Date date = system->ToLocal(cur->request->last_item->item_content.date_creation); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } void item_date_modification(Info & i) { - PT::Date date = system->ToLocal(cur->request->last_item->date_modification); + PT::Date date = system->ToLocal(cur->request->last_item->item_content.date_modification); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } void item_date_creation_nice(Info & i) { - print_date_nice(i, cur->request->last_item->date_creation); + print_date_nice(i, cur->request->last_item->item_content.date_creation); } void item_date_modification_nice(Info & i) { - print_date_nice(i, cur->request->last_item->date_modification); + print_date_nice(i, cur->request->last_item->item_content.date_modification); } void item_dates_equal(Info & i) { - PT::Date & date1 = cur->request->last_item->date_creation; - PT::Date & date2 = cur->request->last_item->date_modification; + PT::Date & date1 = cur->request->last_item->item_content.date_creation; + PT::Date & date2 = cur->request->last_item->item_content.date_modification; i.res = date1 == date2; } @@ -346,7 +340,7 @@ void item_run(Info & i) else ezc_generator.Generate(item_run_content); - item_print_content(i.out, item_run_content.Str(), cur->request->last_item->content_type); + item_print_content(i.out, item_run_content.Str(), cur->request->last_item->item_content.content_raw_type); } else { @@ -357,7 +351,7 @@ void item_run(Info & i) void item_guest_name(Info & i) { - i.out << cur->request->last_item->guest_name; + i.out << cur->request->last_item->item_content.guest_name; } @@ -393,24 +387,24 @@ void item_type_is_symlink(Info & i) void item_is_link_to(Info & i) { - i.res = !cur->request->last_item->link_to.empty(); + i.res = !cur->request->last_item->item_content.link_to.empty(); } void item_link_to(Info & i) { - i.out << cur->request->last_item->link_to; + i.out << cur->request->last_item->item_content.link_to; } void item_is_link_redirect(Info & i) { - i.res = cur->request->last_item->link_redirect == 1; + i.res = cur->request->last_item->item_content.link_redirect == 1; } void item_file_size(Info & i) { - i.res = cur->request->last_item->file_size; + i.res = cur->request->last_item->item_content.file_size; } void item_sort(Info & i) @@ -422,39 +416,39 @@ void item_sort(Info & i) void item_meta_str(Info & i) { - cur->request->last_item->meta.Serialize(i.out, true, false); + cur->request->last_item->item_content.meta.Serialize(i.out, true, false); } void item_meta(Info & i) { - space_value(i, cur->request->last_item->meta); // !! a new interface (last_item instead of item) + space_value(i, cur->request->last_item->item_content.meta); } void item_meta_noescape(Info & i) { - space_value(i, cur->request->last_item->meta, false); + space_value(i, cur->request->last_item->item_content.meta, false); } void item_meta_tab(Info & i) { - space_list_tab(i, cur->request->last_item->meta); + space_list_tab(i, cur->request->last_item->item_content.meta); } void item_meta_tab_value(Info & i) { - space_list_tab_value(i, cur->request->last_item->meta, L"item_meta_tab"); + space_list_tab_value(i, cur->request->last_item->item_content.meta, L"item_meta_tab"); } void item_meta_tab_has_next(Info & i) { - space_list_tab_has_next(i, cur->request->last_item->meta, L"item_meta_tab"); + space_list_tab_has_next(i, cur->request->last_item->item_content.meta, L"item_meta_tab"); } @@ -462,37 +456,37 @@ void item_meta_tab_has_next(Info & i) void item_admin_meta_str(Info & i) { - cur->request->last_item->ameta.Serialize(i.out, true, false); + cur->request->last_item->item_content.meta_admin.Serialize(i.out, true, false); } void item_admin_meta(Info & i) { - space_value(i, cur->request->last_item->ameta); + space_value(i, cur->request->last_item->item_content.meta_admin); } void item_admin_meta_tab(Info & i) { - space_list_tab(i, cur->request->last_item->ameta); + space_list_tab(i, cur->request->last_item->item_content.meta_admin); } void item_admin_meta_tab_value(Info & i) { - space_list_tab_value(i, cur->request->last_item->ameta, L"item_admin_meta_tab"); + space_list_tab_value(i, cur->request->last_item->item_content.meta_admin, L"item_admin_meta_tab"); } void item_admin_meta_tab_has_next(Info & i) { - space_list_tab_has_next(i, cur->request->last_item->ameta, L"item_admin_meta_tab"); + space_list_tab_has_next(i, cur->request->last_item->item_content.meta_admin, L"item_admin_meta_tab"); } void item_can_content_be_html_filtered(Info & i) { - i.res = cur->request->last_item->CanContentBeHtmlFiltered(); + i.res = cur->request->last_item->item_content.CanContentBeHtmlFiltered(); } @@ -536,14 +530,14 @@ void item_tab_subject_noescape(Info & i) void item_tab_content(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.out << cur->request->item_tab[item_index].content; + i.out << cur->request->item_tab[item_index].item_content.content_raw; } void item_tab_content_noescape(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.out << R(cur->request->item_tab[item_index].content); + i.out << R(cur->request->item_tab[item_index].item_content.content_raw); } @@ -552,8 +546,8 @@ void item_tab_print_content(Info & i) if( item_index >= cur->request->item_tab.size() ) return; - std::wstring & content = cur->request->item_tab[item_index].content; - Item::ContentType type = cur->request->item_tab[item_index].content_type; + std::wstring & content = cur->request->item_tab[item_index].item_content.content_raw; + ItemContent::ContentType type = cur->request->item_tab[item_index].item_content.content_raw_type; item_print_content(i.out, content, type); } @@ -562,7 +556,7 @@ void item_tab_print_content(Info & i) void item_tab_privileges(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.out << "0" << Toa(cur->request->item_tab[item_index].privileges, 8); + i.out << "0" << Toa(cur->request->item_tab[item_index].item_content.privileges, 8); } @@ -576,7 +570,7 @@ void item_tab_dir(Info & i) if( system->dirs.MakePath(cur->request->item_tab[item_index].parent_id, path) ) i.out << path; else - i.out << "/the path does not exist/"; // !! do konfiga + i.out << "/the path does not exist/"; // !! IMPROVEME move me to locales and put some info to log } } @@ -607,14 +601,14 @@ void item_tab_link(Info & i) void item_tab_filetype_is_none(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.res = cur->request->item_tab[item_index].file_type == WINIX_ITEM_FILETYPE_NONE; + i.res = cur->request->item_tab[item_index].item_content.file_type == WINIX_ITEM_FILETYPE_NONE; } void item_tab_filetype_is_image(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.res = cur->request->item_tab[item_index].file_type == WINIX_ITEM_FILETYPE_IMAGE; + i.res = cur->request->item_tab[item_index].item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE; } @@ -643,8 +637,8 @@ void item_tab_user(Info & i) { if( item_index < cur->request->item_tab.size() ) { - User * puser = system->users.GetUser(cur->request->item_tab[item_index].user_id); - print_user_name(i, puser, cur->request->item_tab[item_index].guest_name); + User * puser = system->users.GetUser(cur->request->item_tab[item_index].item_content.user_id); + print_user_name(i, puser, cur->request->item_tab[item_index].item_content.guest_name); } } @@ -654,8 +648,8 @@ void item_tab_modification_user(Info & i) { if( item_index < cur->request->item_tab.size() ) { - User * puser = system->users.GetUser(cur->request->item_tab[item_index].modification_user_id); - print_user_name(i, puser, cur->request->item_tab[item_index].guest_name); + User * puser = system->users.GetUser(cur->request->item_tab[item_index].item_content.modification_user_id); + print_user_name(i, puser, cur->request->item_tab[item_index].item_content.guest_name); } } @@ -665,7 +659,7 @@ void item_tab_users_different(Info & i) { if( item_index < cur->request->item_tab.size() ) { - i.res = (cur->request->item_tab[item_index].user_id != cur->request->item_tab[item_index].modification_user_id); + i.res = (cur->request->item_tab[item_index].item_content.user_id != cur->request->item_tab[item_index].item_content.modification_user_id); } } @@ -675,7 +669,7 @@ void item_tab_group(Info & i) { if( item_index < cur->request->item_tab.size() ) { - long group_id = cur->request->item_tab[item_index].group_id; + long group_id = cur->request->item_tab[item_index].item_content.group_id; Group * pgroup = system->groups.GetGroup(group_id); if( pgroup ) @@ -690,7 +684,7 @@ void item_tab_date_creation(Info & i) { if( item_index < cur->request->item_tab.size() ) { - PT::Date date = system->ToLocal(cur->request->item_tab[item_index].date_creation); + PT::Date date = system->ToLocal(cur->request->item_tab[item_index].item_content.date_creation); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } } @@ -700,7 +694,7 @@ void item_tab_date_modification(Info & i) { if( item_index < cur->request->item_tab.size() ) { - PT::Date date = system->ToLocal(cur->request->item_tab[item_index].date_modification); + PT::Date date = system->ToLocal(cur->request->item_tab[item_index].item_content.date_modification); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } } @@ -710,7 +704,7 @@ void item_tab_date_creation_nice(Info & i) { if( item_index < cur->request->item_tab.size() ) { - print_date_nice(i, cur->request->item_tab[item_index].date_creation); + print_date_nice(i, cur->request->item_tab[item_index].item_content.date_creation); } } @@ -720,7 +714,7 @@ void item_tab_date_modification_nice(Info & i) { if( item_index < cur->request->item_tab.size() ) { - print_date_nice(i, cur->request->item_tab[item_index].date_modification); + print_date_nice(i, cur->request->item_tab[item_index].item_content.date_modification); } } @@ -729,8 +723,8 @@ void item_tab_dates_equal(Info & i) { if( item_index < cur->request->item_tab.size() ) { - PT::Date & date1 = cur->request->item_tab[item_index].date_creation; - PT::Date & date2 = cur->request->item_tab[item_index].date_modification; + PT::Date & date1 = cur->request->item_tab[item_index].item_content.date_creation; + PT::Date & date2 = cur->request->item_tab[item_index].item_content.date_modification; i.res = date1 == date2; } @@ -753,7 +747,7 @@ void item_tab_run(Info & i) else ezc_generator.Generate(item_run_content); - item_print_content(i.out, item_run_content.Str(), cur->request->item_tab[item_index].content_type); + item_print_content(i.out, item_run_content.Str(), cur->request->item_tab[item_index].item_content.content_raw_type); } else { @@ -777,8 +771,8 @@ void item_tab_has_static_file(Info & i) { if( item_index < cur->request->item_tab.size() ) { - i.res = cur->request->item_tab[item_index].file_type != WINIX_ITEM_FILETYPE_NONE && - !cur->request->item_tab[item_index].file_path.empty(); + i.res = cur->request->item_tab[item_index].item_content.file_type != WINIX_ITEM_FILETYPE_NONE && + !cur->request->item_tab[item_index].item_content.file_path.empty(); } } @@ -786,7 +780,7 @@ void item_tab_has_static_file(Info & i) void item_tab_has_thumb(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.res = cur->request->item_tab[item_index].has_thumb; + i.res = cur->request->item_tab[item_index].item_content.file_has_thumb; } @@ -814,28 +808,28 @@ void item_tab_type_is_symlink(Info & i) void item_tab_is_link_to(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.res = !cur->request->item_tab[item_index].link_to.empty(); + i.res = !cur->request->item_tab[item_index].item_content.link_to.empty(); } void item_tab_link_to(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.out << cur->request->item_tab[item_index].link_to; + i.out << cur->request->item_tab[item_index].item_content.link_to; } void item_tab_is_link_redirect(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.res = cur->request->item_tab[item_index].link_redirect == 1; + i.res = cur->request->item_tab[item_index].item_content.link_redirect == 1; } void item_tab_file_size(Info & i) { if( item_index < cur->request->item_tab.size() ) - i.out << cur->request->item_tab[item_index].file_size; + i.out << cur->request->item_tab[item_index].item_content.file_size; } void item_tab_sort(Info & i) @@ -854,33 +848,33 @@ void item_tab_has_next(Info & i) void item_tab_meta_str(Info & i) { if( item_index < cur->request->item_tab.size() ) - cur->request->item_tab[item_index].meta.Serialize(i.out, true, false); + cur->request->item_tab[item_index].item_content.meta.Serialize(i.out, true, false); } void item_tab_meta(Info & i) { if( item_index < cur->request->item_tab.size() ) - space_value(i, cur->request->item_tab[item_index].meta); + space_value(i, cur->request->item_tab[item_index].item_content.meta); } void item_tab_meta_noescape(Info & i) { if( item_index < cur->request->item_tab.size() ) - space_value(i, cur->request->item_tab[item_index].meta, false); + space_value(i, cur->request->item_tab[item_index].item_content.meta, false); } void item_tab_meta_tab(Info & i) { if( item_index < cur->request->item_tab.size() ) - space_list_tab(i, cur->request->item_tab[item_index].meta); + space_list_tab(i, cur->request->item_tab[item_index].item_content.meta); } void item_tab_meta_tab_value(Info & i) { if( item_index < cur->request->item_tab.size() ) - space_list_tab_value(i, cur->request->item_tab[item_index].meta, L"item_tab_meta_tab"); + space_list_tab_value(i, cur->request->item_tab[item_index].item_content.meta, L"item_tab_meta_tab"); } @@ -888,7 +882,7 @@ void item_tab_meta_tab_value(Info & i) void item_tab_meta_tab_has_next(Info & i) { if( item_index < cur->request->item_tab.size() ) - space_list_tab_has_next(i, cur->request->item_tab[item_index].meta, L"item_tab_meta_tab"); + space_list_tab_has_next(i, cur->request->item_tab[item_index].item_content.meta, L"item_tab_meta_tab"); } diff --git a/winixd/templates/patterncacher.cpp b/winixd/templates/patterncacher.cpp index 22d089a..417f441 100644 --- a/winixd/templates/patterncacher.cpp +++ b/winixd/templates/patterncacher.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -126,7 +126,7 @@ void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern) pattern_parser.AllowInclude(false); pattern_parser.DeleteWhiteTextItems(false); pattern_parser.SetLogger(&log); - pattern_parser.ParseString(item.content, pattern); + pattern_parser.ParseString(item.item_content.content_raw, pattern); RebuildCache(pattern); } diff --git a/winixd/templates/patterncacher.h b/winixd/templates/patterncacher.h index 364d642..d02d35e 100644 --- a/winixd/templates/patterncacher.h +++ b/winixd/templates/patterncacher.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,11 +37,10 @@ #include #include - -#include "core/item.h" #include "misc.h" #include "ezc.h" #include "core/winixbase.h" +#include "models/item.h" diff --git a/winixd/templates/priv.cpp b/winixd/templates/priv.cpp index 4a6aba2..c90a460 100644 --- a/winixd/templates/priv.cpp +++ b/winixd/templates/priv.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -60,7 +60,7 @@ void priv_user_tab_init(Item & item) if( !cur->session->puser ) { // not logged - priv_user_table.push_back(item.user_id); + priv_user_table.push_back(item.item_content.user_id); } else if( cur->session->puser->super_user ) @@ -75,7 +75,7 @@ void priv_user_tab_init(Item & item) else { // others - priv_user_table.push_back(item.user_id); + priv_user_table.push_back(item.item_content.user_id); } } @@ -133,12 +133,12 @@ void priv_user_tab_isdefault(Info & i) if( cur->request->is_item ) { - if( uid == cur->request->item.user_id ) + if( uid == cur->request->item.item_content.user_id ) i.res = true; } else { - if( uid == cur->request->dir_tab.back()->user_id ) + if( uid == cur->request->dir_tab.back()->item_content.user_id ) i.res = true; } } @@ -165,7 +165,7 @@ void priv_group_tab_init(Item & item) if( !cur->session->puser ) { // not logged - priv_group_table.push_back(item.group_id); + priv_group_table.push_back(item.item_content.group_id); } else if( cur->session->puser->super_user ) @@ -178,7 +178,7 @@ void priv_group_tab_init(Item & item) priv_group_table.push_back(-1); } else - if( cur->session->puser->id == item.user_id ) + if( cur->session->puser->id == item.item_content.user_id ) { bool was_current_group = false; // owner of the item -- is allowed to change only to a group in which he belongs to @@ -186,13 +186,13 @@ void priv_group_tab_init(Item & item) { priv_group_table.push_back(cur->session->puser->groups[i]); - if( item.group_id == cur->session->puser->groups[i] ) + if( item.item_content.group_id == cur->session->puser->groups[i] ) was_current_group = true; } // we're showing the item.group_id if it's different if( !was_current_group ) - priv_group_table.push_back(item.group_id); + priv_group_table.push_back(item.item_content.group_id); // switching to -1 is allowed too priv_group_table.push_back(-1); @@ -200,7 +200,7 @@ void priv_group_tab_init(Item & item) else { // not the owner and not a super user -- the same as not logged - priv_group_table.push_back(item.group_id); + priv_group_table.push_back(item.item_content.group_id); } } @@ -258,12 +258,12 @@ void priv_group_tab_isdefault(Info & i) if( cur->request->is_item ) { - if( gid == cur->request->item.group_id ) + if( gid == cur->request->item.item_content.group_id ) i.res = true; } else { - if( gid == cur->request->dir_tab.back()->group_id ) + if( gid == cur->request->dir_tab.back()->item_content.group_id ) i.res = true; } } @@ -273,9 +273,9 @@ void priv_group_tab_isdefault(Info & i) void priv_privileges(Info & i) { if( cur->request->is_item ) - i.out << Toa(cur->request->item.privileges, 8); + i.out << Toa(cur->request->item.item_content.privileges, 8); else - i.out << Toa(cur->request->dir_tab.back()->privileges, 8); + i.out << Toa(cur->request->dir_tab.back()->item_content.privileges, 8); } diff --git a/winixd/templates/stat.cpp b/winixd/templates/stat.cpp index 385f2d4..4e780ed 100644 --- a/winixd/templates/stat.cpp +++ b/winixd/templates/stat.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2021, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -47,14 +47,14 @@ namespace TemplatesFunctions void stat_item_type_is_file(Info & i) { - i.res = cur->request->is_item && cur->request->item.file_type == WINIX_ITEM_FILETYPE_NONE; + i.res = cur->request->is_item && cur->request->item.item_content.file_type == WINIX_ITEM_FILETYPE_NONE; } void stat_item_type_is_static_file(Info & i) { - i.res = cur->request->is_item && cur->request->item.file_type != WINIX_ITEM_FILETYPE_NONE; + i.res = cur->request->is_item && cur->request->item.item_content.file_type != WINIX_ITEM_FILETYPE_NONE; } @@ -74,14 +74,14 @@ void stat_item_inode(Info & i) void stat_item_user(Info & i) { - User * puser = system->users.GetUser(cur->request->last_item->user_id); - print_user_name(i, puser, cur->request->last_item->guest_name); + User * puser = system->users.GetUser(cur->request->last_item->item_content.user_id); + print_user_name(i, puser, cur->request->last_item->item_content.guest_name); } void stat_item_group(Info & i) { - long group_id = cur->request->last_item->group_id; + long group_id = cur->request->last_item->item_content.group_id; Group * pgroup = system->groups.GetGroup(group_id); if( pgroup ) @@ -93,20 +93,20 @@ void stat_item_group(Info & i) void stat_item_privileges(Info & i) { - i.out << Toa(cur->request->last_item->privileges, 8); + i.out << Toa(cur->request->last_item->item_content.privileges, 8); } void stat_item_date_creation(Info & i) { - PT::Date date = system->ToLocal(cur->request->last_item->date_creation); + PT::Date date = system->ToLocal(cur->request->last_item->item_content.date_creation); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } void stat_item_date_modification(Info & i) { - PT::Date date = system->ToLocal(cur->request->last_item->date_modification); + PT::Date date = system->ToLocal(cur->request->last_item->item_content.date_modification); i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec); } diff --git a/winixd/templates/templates.h b/winixd/templates/templates.h index 113a5c5..0491235 100644 --- a/winixd/templates/templates.h +++ b/winixd/templates/templates.h @@ -330,7 +330,7 @@ namespace TemplatesFunctions void item_content_type_is(Item & item, Info & i); void item_content_type_is(Info & i); void item_content_is_empty(Info & i); - void item_print_content(HtmlTextStream & out, const std::wstring & content, Item::ContentType content_type); + void item_print_content(HtmlTextStream & out, const std::wstring & content, ItemContent::ContentType content_type); void item_print_content(Info & i); void item_privileges(Info & i); void item_dir(Info & i);