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

some work on dependency injection

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/branches/0.7.x@1147 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
tomasz.sowa committed 2018-11-21 17:51:15 +00:00
1 parent a2ffc1e81c
commit 89d303f375
64 files changed
+1734 -1161
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

winixd/plugins/export/Makefile.dep
+45 -4
View File
@@ -23,7 +23,6 @@ edb.o: ../../../../winix/winixd/core/winixbase.h
edb.o: ../../../../winix/winixd/core/config.h
edb.o: ../../../../pikotools/space/spaceparser.h
edb.o: ../../../../pikotools/space/space.h
edb.o: ../../../../winix/winixd/core/htmlfilter.h
edb.o: ../../../../winix/winixd/core/log.h
edb.o: ../../../../winix/winixd/core/textstream.h
edb.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -65,7 +64,6 @@ exportinfo.o: ../../../../winix/winixd/core/winixbase.h
exportinfo.o: ../../../../winix/winixd/core/config.h
exportinfo.o: ../../../../pikotools/space/spaceparser.h
exportinfo.o: ../../../../pikotools/space/space.h
exportinfo.o: ../../../../winix/winixd/core/htmlfilter.h
exportinfo.o: ../../../../winix/winixd/core/log.h
exportinfo.o: ../../../../winix/winixd/core/textstream.h
exportinfo.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -209,7 +207,6 @@ funexport.o: ../../../../pikotools/space/space.h
funexport.o: ../../../../ezc/src/outstreams.h
funexport.o: ../../../../winix/winixd/core/config.h
funexport.o: ../../../../pikotools/space/spaceparser.h
funexport.o: ../../../../winix/winixd/core/htmlfilter.h
funexport.o: ../../../../winix/winixd/core/log.h
funexport.o: ../../../../winix/winixd/core/logmanipulators.h
funexport.o: ../../../../winix/winixd/core/filelog.h
@@ -296,7 +293,6 @@ 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: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -390,3 +386,48 @@ init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/sessionidmanager.h
init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/functions/functions.h
init.o: ../../../../winix/winixd/functions/functionbase.h
init.o: ../../../../winix/winixd/functions/functionparser.h
init.o: ../../../../winix/winixd/functions/account.h
init.o: ../../../../winix/winixd/functions/adduser.h
init.o: ../../../../winix/winixd/functions/cat.h
init.o: ../../../../winix/winixd/functions/chmod.h
init.o: ../../../../winix/winixd/functions/privchanger.h
init.o: ../../../../winix/winixd/functions/chown.h
init.o: ../../../../winix/winixd/functions/ckeditor.h
init.o: ../../../../winix/winixd/functions/cp.h
init.o: ../../../../winix/winixd/functions/default.h
init.o: ../../../../winix/winixd/functions/download.h
init.o: ../../../../winix/winixd/functions/emacs.h
init.o: ../../../../winix/winixd/functions/env.h
init.o: ../../../../winix/winixd/functions/imgcrop.h
init.o: ../../../../winix/winixd/functions/last.h
init.o: ../../../../winix/winixd/functions/login.h
init.o: ../../../../winix/winixd/functions/logout.h
init.o: ../../../../winix/winixd/functions/ln.h
init.o: ../../../../winix/winixd/functions/ls.h
init.o: ../../../../winix/winixd/functions/man.h
init.o: ../../../../winix/winixd/functions/meta.h
init.o: ../../../../winix/winixd/functions/mkdir.h
init.o: ../../../../winix/winixd/functions/mv.h
init.o: ../../../../winix/winixd/functions/nicedit.h
init.o: ../../../../winix/winixd/functions/node.h
init.o: ../../../../winix/winixd/functions/passwd.h
init.o: ../../../../winix/winixd/functions/priv.h
init.o: ../../../../winix/winixd/functions/pw.h
init.o: ../../../../winix/winixd/functions/reload.h
init.o: ../../../../winix/winixd/functions/rm.h
init.o: ../../../../winix/winixd/functions/rmuser.h
init.o: ../../../../winix/winixd/functions/sort.h
init.o: ../../../../winix/winixd/functions/specialdefault.h
init.o: ../../../../winix/winixd/functions/stat.h
init.o: ../../../../winix/winixd/functions/subject.h
init.o: ../../../../winix/winixd/functions/template.h
init.o: ../../../../winix/winixd/functions/tinymce.h
init.o: ../../../../winix/winixd/functions/uname.h
init.o: ../../../../winix/winixd/functions/upload.h
init.o: ../../../../winix/winixd/functions/uptime.h
init.o: ../../../../winix/winixd/functions/who.h
init.o: ../../../../winix/winixd/functions/vim.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
winixd/plugins/export/edb.cpp
+1 -1
View File
@@ -204,7 +204,7 @@ bool EDb::GetExportDirs(std::vector<ExportDir> & export_tab, bool clear_tab)
}
else
{
slog << "There is not such a directory: " << dir_temp << " (skipping)" << logend;
//slog << "There is not such a directory: " << dir_temp << " (skipping)" << logend;
}
}
}
winixd/plugins/export/exportinfo.cpp
+1
View File
@@ -32,6 +32,7 @@
*
*/
#include <algorithm>
#include "core/log.h"
#include "exportinfo.h"
#include "convert/text.h"
winixd/plugins/export/exportinfo.h
+4 -3
View File
@@ -41,17 +41,18 @@
#include "edb.h"
#include "message.h"
#include "exportthread.h"
#include "core/winixbase.h"
namespace Winix
{
namespace Export
{
class ExportInfo
class ExportInfo : public WinixBase
{
public:
winixd/plugins/export/init.cpp
+7 -5
View File
@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -39,12 +39,13 @@
#include "exportinfo.h"
#include "edb.h"
#include "funexport.h"
#include "functions/functions.h"
namespace Winix
{
extern "C" void Init(PluginInfo &);
@@ -71,9 +72,7 @@ void AddWinixFunctions(PluginInfo & info)
void AddMountParams(PluginInfo & info)
{
using TemplatesFunctions::system;
mount_par_export_conf = system->mounts.AddMountPar(L"export_conf");
mount_par_export_conf = info.system->mounts.AddMountPar(L"export_conf");
}
@@ -252,9 +251,12 @@ void Init(PluginInfo & info)
{
using namespace Export;
info.set_dependency_for(edb);
edb.SetConn(info.db->GetConn());
edb.LogQueries(info.config->log_db_query);
edb.SetDirs(&info.system->dirs);
info.set_dependency_for(export_info);
export_info.SetSystem(info.system);
export_info.SetConfig(info.config);
export_info.SetEDb(&edb);