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

updated to the new pikotools api (api2021): HTMLFilter renamed to HTMLParser

Browse Source 
added to config: int html_filter_white_char_mode;
  how white characters between html tags are treated
  0 - WHITE_MODE_ORIGIN - they are copied from input to output
  1 - WHITE_MODE_SINGLE_LINE - new line characters are removed
  2 - WHITE_MODE_TREE - try to create a tree (some kind of pretty printing)
  default: 2
This commit is contained in:
Tomasz Sowa
2021-08-07 02:16:48 +02:00
parent 22134b6cc0
commit b424988d1b
22 changed files with 369 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
winixd/core/Makefile.dep
View File

@@ -9,7 +9,8 @@ acceptbaseparser.o: ../../../pikotools/src/convert/inttostr.h
acceptbaseparser.o: ../../../pikotools/src/utf8/utf8.h
acceptbaseparser.o: ../../../pikotools/src/textstream/stream.h
acceptbaseparser.o: ../../../pikotools/src/utf8/utf8_templates.h
acceptbaseparser.o: ../../../pikotools/src/utf8/utf8_private.h log.h
acceptbaseparser.o: ../../../pikotools/src/utf8/utf8_private.h
acceptbaseparser.o: ../../../pikotools/src/convert/baseparser.h log.h
acceptbaseparser.o: logmanipulators.h ../../../pikotools/src/log/log.h
acceptbaseparser.o: ../../../pikotools/src/textstream/textstream.h
acceptbaseparser.o: ../../../pikotools/src/textstream/stream.h
@@ -85,6 +86,7 @@ app.o: ../../../winix/winixd/templates/locale.h
app.o: ../../../pikotools/src/space/spaceparser.h
app.o: ../../../pikotools/src/space/space.h
app.o: ../../../pikotools/src/textstream/types.h
app.o: ../../../pikotools/src/convert/baseparser.h
app.o: ../../../winix/winixd/core/winixbase.h
app.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
app.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
@@ -190,7 +192,7 @@ app.o: ../../../winix/winixd/functions/upload.h
app.o: ../../../winix/winixd/functions/uptime.h
app.o: ../../../winix/winixd/functions/who.h
app.o: ../../../winix/winixd/functions/vim.h
app.o: ../../../pikotools/src/html/htmlfilter.h
app.o: ../../../pikotools/src/html/htmlparser.h
app.o: ../../../winix/winixd/templates/templates.h
app.o: ../../../winix/winixd/templates/patterncacher.h
app.o: ../../../winix/winixd/templates/indexpatterns.h
@@ -209,7 +211,8 @@ basethread.o: ../../../pikotools/src/convert/inttostr.h
basethread.o: ../../../pikotools/src/utf8/utf8.h
basethread.o: ../../../pikotools/src/textstream/stream.h
basethread.o: ../../../pikotools/src/utf8/utf8_templates.h
basethread.o: ../../../pikotools/src/utf8/utf8_private.h log.h
basethread.o: ../../../pikotools/src/utf8/utf8_private.h
basethread.o: ../../../pikotools/src/convert/baseparser.h log.h
basethread.o: logmanipulators.h ../../../pikotools/src/log/log.h
basethread.o: ../../../pikotools/src/textstream/textstream.h
basethread.o: ../../../pikotools/src/textstream/stream.h
@@ -255,8 +258,9 @@ compress.o: ../../../pikotools/src/utf8/utf8_private.h winixbase.h
compress.o: ../../../winix/winixd/core/config.h
compress.o: ../../../pikotools/src/space/spaceparser.h
compress.o: ../../../pikotools/src/space/space.h
compress.o: ../../../pikotools/src/textstream/types.h log.h logmanipulators.h
compress.o: ../../../pikotools/src/log/log.h filelog.h
compress.o: ../../../pikotools/src/textstream/types.h
compress.o: ../../../pikotools/src/convert/baseparser.h log.h
compress.o: logmanipulators.h ../../../pikotools/src/log/log.h filelog.h
compress.o: ../../../winix/winixd/core/synchro.h ../../../morm/src/morm.h
compress.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
compress.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
@@ -320,6 +324,7 @@ config.o: ../../../winix/winixd/core/config.h
config.o: ../../../pikotools/src/space/spaceparser.h
config.o: ../../../pikotools/src/space/space.h
config.o: ../../../pikotools/src/textstream/types.h
config.o: ../../../pikotools/src/convert/baseparser.h
config.o: ../../../winix/winixd/core/log.h
config.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
config.o: ../../../winix/winixd/models/user.h
@@ -346,7 +351,8 @@ crypt.o: ../../../pikotools/src/convert/inttostr.h
crypt.o: ../../../pikotools/src/utf8/utf8.h
crypt.o: ../../../pikotools/src/textstream/stream.h
crypt.o: ../../../pikotools/src/utf8/utf8_templates.h
crypt.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h
crypt.o: ../../../pikotools/src/utf8/utf8_private.h
crypt.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
crypt.o: ../../../pikotools/src/log/log.h
crypt.o: ../../../pikotools/src/textstream/textstream.h
crypt.o: ../../../pikotools/src/textstream/stream.h
@@ -405,7 +411,8 @@ dircontainer.o: ../../../pikotools/src/convert/inttostr.h
dircontainer.o: ../../../pikotools/src/utf8/utf8.h
dircontainer.o: ../../../pikotools/src/textstream/stream.h
dircontainer.o: ../../../pikotools/src/utf8/utf8_templates.h
dircontainer.o: ../../../pikotools/src/utf8/utf8_private.h log.h
dircontainer.o: ../../../pikotools/src/utf8/utf8_private.h
dircontainer.o: ../../../pikotools/src/convert/baseparser.h log.h
dircontainer.o: logmanipulators.h ../../../pikotools/src/log/log.h
dircontainer.o: ../../../pikotools/src/textstream/textstream.h
dircontainer.o: ../../../pikotools/src/textstream/stream.h
@@ -469,7 +476,8 @@ dirs.o: ../../../pikotools/src/convert/inttostr.h
dirs.o: ../../../pikotools/src/utf8/utf8.h
dirs.o: ../../../pikotools/src/textstream/stream.h
dirs.o: ../../../pikotools/src/utf8/utf8_templates.h
dirs.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h
dirs.o: ../../../pikotools/src/utf8/utf8_private.h
dirs.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
dirs.o: ../../../pikotools/src/log/log.h
dirs.o: ../../../pikotools/src/textstream/textstream.h
dirs.o: ../../../pikotools/src/textstream/stream.h
@@ -555,7 +563,8 @@ filelog.o: ../../../pikotools/src/utf8/utf8_templates.h
filelog.o: ../../../pikotools/src/utf8/utf8_private.h timezones.h timezone.h
filelog.o: ../../../pikotools/src/space/spaceparser.h
filelog.o: ../../../pikotools/src/space/space.h
filelog.o: ../../../pikotools/src/textstream/types.h winixbase.h
filelog.o: ../../../pikotools/src/textstream/types.h
filelog.o: ../../../pikotools/src/convert/baseparser.h winixbase.h
filelog.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
filelog.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h
filelog.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
@@ -613,7 +622,8 @@ groups.o: ../../../winix/winixd/core/winixbase.h
groups.o: ../../../winix/winixd/core/config.h
groups.o: ../../../pikotools/src/space/spaceparser.h
groups.o: ../../../pikotools/src/space/space.h
groups.o: ../../../pikotools/src/textstream/types.h log.h logmanipulators.h
groups.o: ../../../pikotools/src/textstream/types.h
groups.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
groups.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
groups.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
groups.o: ../../../morm/src/postgresqlexpression.h
@@ -656,7 +666,8 @@ httpsimpleparser.o: ../../../pikotools/src/convert/inttostr.h
httpsimpleparser.o: ../../../pikotools/src/utf8/utf8.h
httpsimpleparser.o: ../../../pikotools/src/textstream/stream.h
httpsimpleparser.o: ../../../pikotools/src/utf8/utf8_templates.h
httpsimpleparser.o: ../../../pikotools/src/utf8/utf8_private.h log.h
httpsimpleparser.o: ../../../pikotools/src/utf8/utf8_private.h
httpsimpleparser.o: ../../../pikotools/src/convert/baseparser.h log.h
httpsimpleparser.o: logmanipulators.h ../../../pikotools/src/log/log.h
httpsimpleparser.o: ../../../pikotools/src/textstream/textstream.h
httpsimpleparser.o: ../../../pikotools/src/textstream/stream.h
@@ -711,7 +722,8 @@ image.o: ../../../pikotools/src/convert/inttostr.h
image.o: ../../../pikotools/src/utf8/utf8.h
image.o: ../../../pikotools/src/textstream/stream.h
image.o: ../../../pikotools/src/utf8/utf8_templates.h
image.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h
image.o: ../../../pikotools/src/utf8/utf8_private.h
image.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
image.o: ../../../pikotools/src/log/log.h
image.o: ../../../pikotools/src/textstream/textstream.h
image.o: ../../../pikotools/src/textstream/stream.h
@@ -797,7 +809,8 @@ ipbancontainer.o: ../../../pikotools/src/convert/inttostr.h
ipbancontainer.o: ../../../pikotools/src/utf8/utf8.h
ipbancontainer.o: ../../../pikotools/src/textstream/stream.h
ipbancontainer.o: ../../../pikotools/src/utf8/utf8_templates.h
ipbancontainer.o: ../../../pikotools/src/utf8/utf8_private.h log.h
ipbancontainer.o: ../../../pikotools/src/utf8/utf8_private.h
ipbancontainer.o: ../../../pikotools/src/convert/baseparser.h log.h
ipbancontainer.o: logmanipulators.h ../../../pikotools/src/log/log.h
ipbancontainer.o: ../../../pikotools/src/textstream/textstream.h
ipbancontainer.o: ../../../pikotools/src/textstream/stream.h
@@ -843,7 +856,8 @@ job.o: ../../../pikotools/src/convert/inttostr.h
job.o: ../../../pikotools/src/utf8/utf8.h
job.o: ../../../pikotools/src/textstream/stream.h
job.o: ../../../pikotools/src/utf8/utf8_templates.h
job.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h
job.o: ../../../pikotools/src/utf8/utf8_private.h
job.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
job.o: ../../../pikotools/src/log/log.h
job.o: ../../../pikotools/src/textstream/textstream.h
job.o: ../../../pikotools/src/textstream/stream.h
@@ -880,7 +894,8 @@ lastcontainer.o: ../../../pikotools/src/textstream/types.h
lastcontainer.o: ../../../pikotools/src/utf8/utf8.h
lastcontainer.o: ../../../pikotools/src/textstream/stream.h
lastcontainer.o: ../../../pikotools/src/utf8/utf8_templates.h
lastcontainer.o: ../../../pikotools/src/utf8/utf8_private.h log.h
lastcontainer.o: ../../../pikotools/src/utf8/utf8_private.h
lastcontainer.o: ../../../pikotools/src/convert/baseparser.h log.h
lastcontainer.o: logmanipulators.h ../../../pikotools/src/log/log.h
lastcontainer.o: ../../../pikotools/src/textstream/textstream.h
lastcontainer.o: ../../../pikotools/src/textstream/stream.h
@@ -927,8 +942,9 @@ loadavg.o: ../../../pikotools/src/convert/inttostr.h
loadavg.o: ../../../pikotools/src/utf8/utf8.h
loadavg.o: ../../../pikotools/src/textstream/stream.h
loadavg.o: ../../../pikotools/src/utf8/utf8_templates.h
loadavg.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h
loadavg.o: ../../../pikotools/src/log/log.h
loadavg.o: ../../../pikotools/src/utf8/utf8_private.h
loadavg.o: ../../../pikotools/src/convert/baseparser.h log.h
loadavg.o: logmanipulators.h ../../../pikotools/src/log/log.h
loadavg.o: ../../../pikotools/src/textstream/textstream.h
loadavg.o: ../../../pikotools/src/textstream/stream.h
loadavg.o: ../../../pikotools/src/space/space.h
@@ -1042,7 +1058,8 @@ misc.o: ../../../winix/winixd/core/winixbase.h
misc.o: ../../../winix/winixd/core/config.h
misc.o: ../../../pikotools/src/space/spaceparser.h
misc.o: ../../../pikotools/src/space/space.h
misc.o: ../../../pikotools/src/textstream/types.h log.h logmanipulators.h
misc.o: ../../../pikotools/src/textstream/types.h
misc.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
misc.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h
misc.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
misc.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
@@ -1077,7 +1094,7 @@ misc.o: ../../../winix/winixd/templates/patterns.h
misc.o: ../../../winix/winixd/templates/changepatterns.h
misc.o: ../../../winix/winixd/core/cur.h ../../../winix/winixd/core/system.h
misc.o: ../../../winix/winixd/core/sessionmanager.h
misc.o: ../../../pikotools/src/html/htmlfilter.h
misc.o: ../../../pikotools/src/html/htmlparser.h
misc.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
misc.o: ../../../winix/winixd/db/dbconn.h
misc.o: ../../../winix/winixd/db/dbtextstream.h
@@ -1120,7 +1137,8 @@ mountparser.o: ../../../pikotools/src/convert/inttostr.h
mountparser.o: ../../../pikotools/src/utf8/utf8.h
mountparser.o: ../../../pikotools/src/textstream/stream.h
mountparser.o: ../../../pikotools/src/utf8/utf8_templates.h
mountparser.o: ../../../pikotools/src/utf8/utf8_private.h log.h
mountparser.o: ../../../pikotools/src/utf8/utf8_private.h
mountparser.o: ../../../pikotools/src/convert/baseparser.h log.h
mountparser.o: logmanipulators.h ../../../pikotools/src/log/log.h
mountparser.o: ../../../pikotools/src/textstream/textstream.h
mountparser.o: ../../../pikotools/src/textstream/stream.h
@@ -1198,7 +1216,8 @@ mounts.o: ../../../pikotools/src/convert/inttostr.h
mounts.o: ../../../pikotools/src/utf8/utf8.h
mounts.o: ../../../pikotools/src/textstream/stream.h
mounts.o: ../../../pikotools/src/utf8/utf8_templates.h
mounts.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h
mounts.o: ../../../pikotools/src/utf8/utf8_private.h
mounts.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
mounts.o: ../../../pikotools/src/log/log.h
mounts.o: ../../../pikotools/src/textstream/textstream.h
mounts.o: ../../../pikotools/src/textstream/stream.h
@@ -1271,7 +1290,8 @@ plugin.o: ../../../pikotools/src/convert/inttostr.h
plugin.o: ../../../pikotools/src/utf8/utf8.h
plugin.o: ../../../pikotools/src/textstream/stream.h
plugin.o: ../../../pikotools/src/utf8/utf8_templates.h
plugin.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h
plugin.o: ../../../pikotools/src/utf8/utf8_private.h
plugin.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
plugin.o: ../../../pikotools/src/log/log.h
plugin.o: ../../../pikotools/src/textstream/textstream.h
plugin.o: ../../../pikotools/src/textstream/stream.h
@@ -1403,7 +1423,7 @@ plugin.o: ../../../winix/winixd/functions/upload.h
plugin.o: ../../../winix/winixd/functions/uptime.h
plugin.o: ../../../winix/winixd/functions/who.h
plugin.o: ../../../winix/winixd/functions/vim.h
plugin.o: ../../../pikotools/src/html/htmlfilter.h
plugin.o: ../../../pikotools/src/html/htmlparser.h
plugin.o: ../../../winix/winixd/templates/templates.h
plugin.o: ../../../winix/winixd/templates/patterncacher.h
plugin.o: ../../../winix/winixd/templates/indexpatterns.h
@@ -1418,7 +1438,8 @@ plugindata.o: ../../../pikotools/src/convert/inttostr.h
plugindata.o: ../../../pikotools/src/utf8/utf8.h
plugindata.o: ../../../pikotools/src/textstream/stream.h
plugindata.o: ../../../pikotools/src/utf8/utf8_templates.h
plugindata.o: ../../../pikotools/src/utf8/utf8_private.h log.h
plugindata.o: ../../../pikotools/src/utf8/utf8_private.h
plugindata.o: ../../../pikotools/src/convert/baseparser.h log.h
plugindata.o: logmanipulators.h ../../../pikotools/src/log/log.h
plugindata.o: ../../../pikotools/src/textstream/textstream.h
plugindata.o: ../../../pikotools/src/textstream/stream.h
@@ -1469,7 +1490,8 @@ postmultiparser.o: ../../../pikotools/src/convert/double.h winixbase.h
postmultiparser.o: ../../../winix/winixd/core/config.h
postmultiparser.o: ../../../pikotools/src/space/spaceparser.h
postmultiparser.o: ../../../pikotools/src/space/space.h
postmultiparser.o: ../../../pikotools/src/textstream/types.h log.h
postmultiparser.o: ../../../pikotools/src/textstream/types.h
postmultiparser.o: ../../../pikotools/src/convert/baseparser.h log.h
postmultiparser.o: logmanipulators.h ../../../pikotools/src/log/log.h
postmultiparser.o: filelog.h ../../../winix/winixd/core/synchro.h
postmultiparser.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h
@@ -1534,6 +1556,7 @@ rebus.o: ../../../winix/winixd/core/config.h
rebus.o: ../../../pikotools/src/space/spaceparser.h
rebus.o: ../../../pikotools/src/space/space.h
rebus.o: ../../../pikotools/src/textstream/types.h
rebus.o: ../../../pikotools/src/convert/baseparser.h
rebus.o: ../../../winix/winixd/core/log.h
rebus.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h
rebus.o: requesttypes.h winix_const.h
@@ -1602,6 +1625,7 @@ request.o: ../../../winix/winixd/templates/locale.h
request.o: ../../../pikotools/src/space/spaceparser.h
request.o: ../../../pikotools/src/space/space.h
request.o: ../../../pikotools/src/textstream/types.h
request.o: ../../../pikotools/src/convert/baseparser.h
request.o: ../../../winix/winixd/core/winixbase.h
request.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
request.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
@@ -1662,7 +1686,8 @@ run.o: ../../../pikotools/src/convert/inttostr.h
run.o: ../../../pikotools/src/utf8/utf8.h
run.o: ../../../pikotools/src/textstream/stream.h
run.o: ../../../pikotools/src/utf8/utf8_templates.h
run.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h
run.o: ../../../pikotools/src/utf8/utf8_private.h
run.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
run.o: ../../../pikotools/src/log/log.h
run.o: ../../../pikotools/src/textstream/textstream.h
run.o: ../../../pikotools/src/textstream/stream.h
@@ -1723,6 +1748,7 @@ session.o: ../../../winix/winixd/templates/locale.h
session.o: ../../../pikotools/src/space/spaceparser.h
session.o: ../../../pikotools/src/space/space.h
session.o: ../../../pikotools/src/textstream/types.h
session.o: ../../../pikotools/src/convert/baseparser.h
session.o: ../../../winix/winixd/core/winixbase.h
session.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
session.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
@@ -1791,6 +1817,7 @@ sessioncontainer.o: ../../../winix/winixd/templates/locale.h
sessioncontainer.o: ../../../pikotools/src/space/spaceparser.h
sessioncontainer.o: ../../../pikotools/src/space/space.h
sessioncontainer.o: ../../../pikotools/src/textstream/types.h
sessioncontainer.o: ../../../pikotools/src/convert/baseparser.h
sessioncontainer.o: ../../../winix/winixd/core/winixbase.h
sessioncontainer.o: ../../../winix/winixd/core/config.h log.h
sessioncontainer.o: logmanipulators.h ../../../morm/src/morm.h
@@ -1838,7 +1865,8 @@ sessionidmanager.o: ../../../pikotools/src/convert/inttostr.h
sessionidmanager.o: ../../../pikotools/src/utf8/utf8.h
sessionidmanager.o: ../../../pikotools/src/textstream/stream.h
sessionidmanager.o: ../../../pikotools/src/utf8/utf8_templates.h
sessionidmanager.o: ../../../pikotools/src/utf8/utf8_private.h log.h
sessionidmanager.o: ../../../pikotools/src/utf8/utf8_private.h
sessionidmanager.o: ../../../pikotools/src/convert/baseparser.h log.h
sessionidmanager.o: logmanipulators.h ../../../pikotools/src/log/log.h
sessionidmanager.o: ../../../pikotools/src/textstream/textstream.h
sessionidmanager.o: ../../../pikotools/src/textstream/stream.h
@@ -1920,6 +1948,7 @@ sessionmanager.o: ../../../winix/winixd/templates/locale.h
sessionmanager.o: ../../../pikotools/src/space/spaceparser.h
sessionmanager.o: ../../../pikotools/src/space/space.h
sessionmanager.o: ../../../pikotools/src/textstream/types.h
sessionmanager.o: ../../../pikotools/src/convert/baseparser.h
sessionmanager.o: ../../../winix/winixd/core/winixbase.h
sessionmanager.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
sessionmanager.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
@@ -2025,6 +2054,7 @@ sessionparser.o: ../../../winix/winixd/templates/locale.h
sessionparser.o: ../../../pikotools/src/space/spaceparser.h
sessionparser.o: ../../../pikotools/src/space/space.h
sessionparser.o: ../../../pikotools/src/textstream/types.h
sessionparser.o: ../../../pikotools/src/convert/baseparser.h
sessionparser.o: ../../../winix/winixd/core/winixbase.h
sessionparser.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
sessionparser.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
@@ -2106,6 +2136,7 @@ slog.o: ../../../winix/winixd/templates/locale.h
slog.o: ../../../pikotools/src/space/spaceparser.h
slog.o: ../../../pikotools/src/space/space.h
slog.o: ../../../pikotools/src/textstream/types.h
slog.o: ../../../pikotools/src/convert/baseparser.h
slog.o: ../../../winix/winixd/core/winixbase.h
slog.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
slog.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
@@ -2143,7 +2174,8 @@ system.o: ../../../pikotools/src/convert/inttostr.h
system.o: ../../../pikotools/src/utf8/utf8.h
system.o: ../../../pikotools/src/textstream/stream.h
system.o: ../../../pikotools/src/utf8/utf8_templates.h
system.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h
system.o: ../../../pikotools/src/utf8/utf8_private.h
system.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h
system.o: ../../../pikotools/src/log/log.h
system.o: ../../../pikotools/src/textstream/textstream.h
system.o: ../../../pikotools/src/textstream/stream.h
@@ -2226,7 +2258,7 @@ system.o: ../../../winix/winixd/templates/changepatterns.h
system.o: ../../../winix/winixd/core/cur.h
system.o: ../../../winix/winixd/core/system.h
system.o: ../../../winix/winixd/core/sessionmanager.h
system.o: ../../../pikotools/src/html/htmlfilter.h
system.o: ../../../pikotools/src/html/htmlparser.h
system.o: ../../../winix/winixd/core/winixrequest.h
system.o: ../../../winix/winixd/core/winixsystem.h
system.o: ../../../winix/winixd/core/slog.h
@@ -2288,7 +2320,8 @@ threadmanager.o: ../../../pikotools/src/convert/inttostr.h
threadmanager.o: ../../../pikotools/src/utf8/utf8.h
threadmanager.o: ../../../pikotools/src/textstream/stream.h
threadmanager.o: ../../../pikotools/src/utf8/utf8_templates.h
threadmanager.o: ../../../pikotools/src/utf8/utf8_private.h log.h
threadmanager.o: ../../../pikotools/src/utf8/utf8_private.h
threadmanager.o: ../../../pikotools/src/convert/baseparser.h log.h
threadmanager.o: logmanipulators.h ../../../pikotools/src/log/log.h
threadmanager.o: ../../../pikotools/src/textstream/textstream.h
threadmanager.o: ../../../pikotools/src/textstream/stream.h
@@ -2349,7 +2382,8 @@ timezones.o: ../../../pikotools/src/textstream/types.h
timezones.o: ../../../pikotools/src/utf8/utf8.h
timezones.o: ../../../pikotools/src/textstream/stream.h
timezones.o: ../../../pikotools/src/utf8/utf8_templates.h
timezones.o: ../../../pikotools/src/utf8/utf8_private.h winixbase.h
timezones.o: ../../../pikotools/src/utf8/utf8_private.h
timezones.o: ../../../pikotools/src/convert/baseparser.h winixbase.h
timezones.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
timezones.o: ../../../pikotools/src/log/log.h
timezones.o: ../../../pikotools/src/textstream/textstream.h
@@ -2418,6 +2452,7 @@ users.o: ../../../winix/winixd/templates/locale.h
users.o: ../../../pikotools/src/space/spaceparser.h
users.o: ../../../pikotools/src/space/space.h
users.o: ../../../pikotools/src/textstream/types.h
users.o: ../../../pikotools/src/convert/baseparser.h
users.o: ../../../winix/winixd/core/winixbase.h
users.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
users.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
@@ -2480,7 +2515,8 @@ winixbase.o: ../../../pikotools/src/convert/inttostr.h
winixbase.o: ../../../pikotools/src/utf8/utf8.h
winixbase.o: ../../../pikotools/src/textstream/stream.h
winixbase.o: ../../../pikotools/src/utf8/utf8_templates.h
winixbase.o: ../../../pikotools/src/utf8/utf8_private.h log.h
winixbase.o: ../../../pikotools/src/utf8/utf8_private.h
winixbase.o: ../../../pikotools/src/convert/baseparser.h log.h
winixbase.o: logmanipulators.h ../../../pikotools/src/log/log.h
winixbase.o: ../../../pikotools/src/textstream/textstream.h
winixbase.o: ../../../pikotools/src/textstream/stream.h
@@ -2520,7 +2556,8 @@ winixmodeldeprecated.o: ../../../pikotools/src/convert/inttostr.h
winixmodeldeprecated.o: ../../../pikotools/src/utf8/utf8.h
winixmodeldeprecated.o: ../../../pikotools/src/textstream/stream.h
winixmodeldeprecated.o: ../../../pikotools/src/utf8/utf8_templates.h
winixmodeldeprecated.o: ../../../pikotools/src/utf8/utf8_private.h log.h
winixmodeldeprecated.o: ../../../pikotools/src/utf8/utf8_private.h
winixmodeldeprecated.o: ../../../pikotools/src/convert/baseparser.h log.h
winixmodeldeprecated.o: logmanipulators.h ../../../pikotools/src/log/log.h
winixmodeldeprecated.o: ../../../pikotools/src/textstream/textstream.h
winixmodeldeprecated.o: ../../../pikotools/src/textstream/stream.h
@@ -2571,7 +2608,8 @@ winixsystem.o: ../../../pikotools/src/convert/inttostr.h
winixsystem.o: ../../../pikotools/src/utf8/utf8.h
winixsystem.o: ../../../pikotools/src/textstream/stream.h
winixsystem.o: ../../../pikotools/src/utf8/utf8_templates.h
winixsystem.o: ../../../pikotools/src/utf8/utf8_private.h log.h
winixsystem.o: ../../../pikotools/src/utf8/utf8_private.h
winixsystem.o: ../../../pikotools/src/convert/baseparser.h log.h
winixsystem.o: logmanipulators.h ../../../pikotools/src/log/log.h
winixsystem.o: ../../../pikotools/src/textstream/textstream.h
winixsystem.o: ../../../pikotools/src/textstream/stream.h

5
winixd/core/config.cpp
View File

@@ -235,9 +235,8 @@ void Config::AssignValues(bool stdout_is_closed)
compression_page_min_size = Size(L"compression_page_min_size", 512);
compression_encoding = Int(L"compression_encoding", 20);
html_filter = Bool(L"html_filter", true);
html_filter_trim_white = Bool(L"html_filter_trim_white", true);
html_filter_break_word = Int(L"html_filter_break_word", 60);
html_filter = Bool(L"html_filter", false);
html_filter_white_char_mode = Int(L"html_filter_white_char_mode", 2);
html_filter_wrap_line = Int(L"html_filter_wrap_line", 110);
html_filter_tabs = Size(L"html_filter_tabs", 2);
html_filter_orphans = Bool(L"html_filter_orphans", true);

14
winixd/core/config.h
View File

@@ -308,15 +308,15 @@ public:
std::vector<std::wstring> plugin_file;
// should the html code be cleaned by the html filter
// default: false
bool html_filter;
// should white characters be trimmed
bool html_filter_trim_white;
// when long words should be broken (a space will be inserted)
// default: after 60 non white characters there will be put a space
// set zero to turn off
size_t html_filter_break_word;
// how white characters between html tags are treated
// 0 - WHITE_MODE_ORIGIN - they are copied from input to output
// 1 - WHITE_MODE_SINGLE_LINE - new line characters are removed
// 2 - WHITE_MODE_TREE - try to create a tree (some kind of pretty printing)
// default: 2
int html_filter_white_char_mode;
// when long lines should be broken (a new line character will be inserted)
// default: 110