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

added: two options to the config:

Browse Source 
ezc_error_prefix (string)
        ezc_error_postfix (string)
        // prefix and postfix used when there is an error in Ezc patterns
        // default:
        // prefix:  "<!-- "
        // postfix: " -->"
added:  Ezc::Blocks to templates
added:  although patterns have pointers to functions and blocks cached
        the Ezc::Generator should use SetFunctions() and SetBlocks() method
        in order to correctly recognize variables (aliases)




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@978 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2014-10-19 21:20:09 +00:00
parent 5266a7e4e5
commit fb18b2238e
27 changed files with 1105 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

283
templates/Makefile.dep
View File

@@ -3,10 +3,10 @@
adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
adduser.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
adduser.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
adduser.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
adduser.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
adduser.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
adduser.o: ../../pikotools/textstream/types.h
adduser.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
adduser.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
adduser.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
adduser.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
adduser.o: ../../pikotools/textstream/textstream.h
adduser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
adduser.o: ../../pikotools/convert/convert.h
@@ -64,15 +64,16 @@ changepatterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
changepatterns.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h
changepatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
changepatterns.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
changepatterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
changepatterns.o: misc.h htmltextstream.h ../../winix/core/textstream.h
changepatterns.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
changepatterns.o: ../../ezc/src/patternparser.h misc.h htmltextstream.h
changepatterns.o: ../../winix/core/textstream.h
config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
config.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
config.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
config.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
config.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
config.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
config.o: ../../pikotools/textstream/types.h
config.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
config.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
config.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
config.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
config.o: ../../pikotools/textstream/textstream.h
config.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
config.o: ../../pikotools/convert/convert.h
@@ -118,10 +119,10 @@ config.o: ../../winix/core/htmlfilter.h
dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
dir.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
dir.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
dir.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
dir.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
dir.o: ../../pikotools/textstream/types.h
dir.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
dir.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
dir.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
dir.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
dir.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
dir.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
dir.o: ../../pikotools/convert/inttostr.h
@@ -188,10 +189,10 @@ dir.o: ../../winix/functions/vim.h miscspace.h
doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
doc.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
doc.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
doc.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
doc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
doc.o: ../../pikotools/textstream/types.h
doc.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
doc.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
doc.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
doc.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
doc.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
doc.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
doc.o: ../../pikotools/convert/inttostr.h
@@ -235,10 +236,10 @@ doc.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
env.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
env.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
env.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
env.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
env.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
env.o: ../../pikotools/textstream/types.h
env.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
env.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
env.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
env.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
env.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
env.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
env.o: ../../pikotools/convert/inttostr.h
@@ -305,10 +306,10 @@ env.o: ../../winix/functions/vim.h
filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
filters.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
filters.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
filters.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
filters.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
filters.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
filters.o: ../../pikotools/textstream/types.h
filters.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
filters.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
filters.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
filters.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
filters.o: ../../pikotools/textstream/textstream.h
filters.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
filters.o: ../../pikotools/convert/convert.h
@@ -366,15 +367,15 @@ htmltextstream.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h
htmltextstream.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
htmltextstream.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
htmltextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
htmltextstream.o: ../../ezc/src/patternparser.h
htmltextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
htmltextstream.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h
indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
indexpatterns.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
indexpatterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
indexpatterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
indexpatterns.o: ../../ezc/src/patternparser.h patterns.h locale.h
indexpatterns.o: ../../pikotools/space/spaceparser.h
indexpatterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
indexpatterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
indexpatterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h
indexpatterns.o: ../../pikotools/space/space.h
indexpatterns.o: ../../pikotools/textstream/types.h
indexpatterns.o: ../../pikotools/textstream/textstream.h
@@ -390,10 +391,10 @@ indexpatterns.o: ../../winix/core/cur.h ../../winix/templates/locale.h
insert.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
insert.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
insert.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
insert.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
insert.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
insert.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
insert.o: ../../pikotools/textstream/types.h
insert.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
insert.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
insert.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
insert.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
insert.o: ../../pikotools/textstream/textstream.h
insert.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
insert.o: ../../pikotools/convert/convert.h
@@ -440,10 +441,10 @@ insert.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
ipban.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
ipban.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
ipban.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
ipban.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
ipban.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
ipban.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
ipban.o: ../../pikotools/textstream/types.h
ipban.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
ipban.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
ipban.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
ipban.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
ipban.o: ../../pikotools/textstream/textstream.h
ipban.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
ipban.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
@@ -513,10 +514,10 @@ ipban.o: ../../winix/functions/vim.h
item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
item.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
item.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
item.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
item.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
item.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
item.o: ../../pikotools/textstream/types.h
item.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
item.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
item.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
item.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
item.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
item.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
item.o: ../../pikotools/convert/inttostr.h
@@ -561,10 +562,10 @@ item.o: ../../winix/core/bbcodeparser.h miscspace.h
last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
last.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
last.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
last.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
last.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
last.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
last.o: ../../pikotools/textstream/types.h
last.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
last.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
last.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
last.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
last.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
last.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
last.o: ../../pikotools/convert/inttostr.h
@@ -631,17 +632,17 @@ localefilter.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h
localefilter.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
localefilter.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
localefilter.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
localefilter.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
localefilter.o: ../../ezc/src/patternparser.h ../core/misc.h
localefilter.o: ../../winix/core/requesttypes.h
localefilter.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
localefilter.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
localefilter.o: ../core/misc.h ../../winix/core/requesttypes.h
localefilter.o: ../../winix/core/winix_const.h
login.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
login.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
login.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
login.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
login.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
login.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
login.o: ../../pikotools/textstream/types.h
login.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
login.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
login.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
login.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
login.o: ../../pikotools/textstream/textstream.h
login.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
login.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
@@ -709,10 +710,10 @@ login.o: ../../winix/functions/vim.h
ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
ls.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
ls.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
ls.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
ls.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
ls.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
ls.o: ../../pikotools/textstream/types.h
ls.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
ls.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
ls.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
ls.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
ls.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
ls.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
ls.o: ../../pikotools/convert/inttostr.h
@@ -755,10 +756,10 @@ ls.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
man.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
man.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
man.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
man.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
man.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
man.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
man.o: ../../pikotools/textstream/types.h
man.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
man.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
man.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
man.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
man.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
man.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
man.o: ../../pikotools/convert/inttostr.h
@@ -825,10 +826,10 @@ man.o: ../../winix/functions/vim.h
misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
misc.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
misc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
misc.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
misc.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
misc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
misc.o: ../../pikotools/textstream/types.h
misc.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
misc.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
misc.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
misc.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
misc.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
misc.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
misc.o: ../../pikotools/convert/inttostr.h
@@ -872,9 +873,9 @@ misc.o: ../../winix/core/winix_const.h ../../winix/core/request.h
miscspace.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
miscspace.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
miscspace.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
miscspace.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
miscspace.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
miscspace.o: ../../pikotools/space/spaceparser.h
miscspace.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
miscspace.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
miscspace.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
miscspace.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
miscspace.o: ../../pikotools/textstream/textstream.h
miscspace.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
@@ -922,10 +923,10 @@ miscspace.o: ../../winix/core/htmlfilter.h
mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
mount.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
mount.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
mount.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
mount.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
mount.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
mount.o: ../../pikotools/textstream/types.h
mount.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
mount.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
mount.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
mount.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
mount.o: ../../pikotools/textstream/textstream.h
mount.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
mount.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
@@ -972,9 +973,10 @@ passwd.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h
passwd.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
passwd.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
passwd.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
passwd.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
passwd.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
passwd.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
passwd.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
passwd.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
passwd.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
passwd.o: ../../pikotools/textstream/types.h
passwd.o: ../../pikotools/textstream/textstream.h
passwd.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
passwd.o: ../../pikotools/convert/convert.h
@@ -1031,10 +1033,10 @@ patterncacher.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h
patterncacher.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
patterncacher.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
patterncacher.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
patterncacher.o: ../../ezc/src/patternparser.h htmltextstream.h
patterncacher.o: ../../winix/core/textstream.h ../../winix/core/log.h
patterncacher.o: ../../winix/core/textstream.h
patterncacher.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
patterncacher.o: htmltextstream.h ../../winix/core/textstream.h
patterncacher.o: ../../winix/core/log.h ../../winix/core/textstream.h
patterncacher.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h
patterncacher.o: ../../winix/core/cur.h ../../winix/templates/locale.h
patterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h
@@ -1048,19 +1050,19 @@ patterns.o: ../../pikotools/textstream/types.h localefilter.h
patterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
patterns.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
patterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
patterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
patterns.o: ../../ezc/src/patternparser.h misc.h htmltextstream.h
patterns.o: ../../winix/core/textstream.h ../../winix/core/log.h
patterns.o: ../../winix/core/textstream.h ../../winix/core/logmanipulators.h
patterns.o: ../../winix/core/slog.h ../../winix/core/cur.h
patterns.o: ../../winix/templates/locale.h
patterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
patterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
patterns.o: htmltextstream.h ../../winix/core/textstream.h
patterns.o: ../../winix/core/log.h ../../winix/core/textstream.h
patterns.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h
patterns.o: ../../winix/core/cur.h ../../winix/templates/locale.h
priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
priv.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
priv.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
priv.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
priv.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
priv.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
priv.o: ../../pikotools/textstream/types.h
priv.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
priv.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
priv.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
priv.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
priv.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
priv.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
priv.o: ../../pikotools/convert/inttostr.h
@@ -1129,9 +1131,10 @@ rebus.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h
rebus.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
rebus.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
rebus.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
rebus.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
rebus.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
rebus.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
rebus.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
rebus.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
rebus.o: ../../pikotools/textstream/types.h
rebus.o: ../../pikotools/textstream/textstream.h
rebus.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
rebus.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
@@ -1183,16 +1186,16 @@ slog.o: ../../pikotools/textstream/types.h templates.h ../../ezc/src/ezc.h
slog.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h
slog.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
slog.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
slog.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
slog.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
slog.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
slog.o: htmltextstream.h ../../winix/core/textstream.h patterncacher.h
slog.o: ../../winix/core/item.h indexpatterns.h patterns.h changepatterns.h
slog.o: ../../winix/core/config.h ../../winix/core/htmlfilter.h
slog.o: ../../winix/core/cur.h ../../winix/core/request.h
slog.o: ../../winix/core/requesttypes.h ../../winix/core/error.h
slog.o: ../../winix/core/config.h ../../winix/core/textstream.h
slog.o: ../../winix/templates/htmltextstream.h
slog.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
slog.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
slog.o: ../../pikotools/textstream/types.h htmltextstream.h
slog.o: ../../winix/core/textstream.h patterncacher.h ../../winix/core/item.h
slog.o: indexpatterns.h patterns.h changepatterns.h ../../winix/core/config.h
slog.o: ../../winix/core/htmlfilter.h ../../winix/core/cur.h
slog.o: ../../winix/core/request.h ../../winix/core/requesttypes.h
slog.o: ../../winix/core/error.h ../../winix/core/config.h
slog.o: ../../winix/core/textstream.h ../../winix/templates/htmltextstream.h
slog.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h
slog.o: ../../winix/core/user.h ../../winix/core/plugindata.h
slog.o: ../../winix/core/rebus.h ../../winix/core/ipban.h
@@ -1222,10 +1225,10 @@ slog.o: ../../winix/core/system.h ../../winix/core/htmlfilter.h
stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
stat.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
stat.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
stat.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
stat.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
stat.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
stat.o: ../../pikotools/textstream/types.h
stat.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
stat.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
stat.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
stat.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
stat.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
stat.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
stat.o: ../../pikotools/convert/inttostr.h
@@ -1269,10 +1272,10 @@ stat.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
sys.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
sys.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
sys.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
sys.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
sys.o: ../../pikotools/textstream/types.h
sys.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
sys.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
sys.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
sys.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
sys.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
sys.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
sys.o: ../../pikotools/convert/inttostr.h
@@ -1340,10 +1343,10 @@ sys.o: ../../winix/functions/vim.h ../../winix/templates/templates.h
template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
template.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
template.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
template.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
template.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
template.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
template.o: ../../pikotools/textstream/types.h
template.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
template.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
template.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
template.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
template.o: ../../pikotools/textstream/textstream.h
template.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
template.o: ../../pikotools/convert/convert.h
@@ -1391,9 +1394,9 @@ template.o: ../../winix/core/winix_const.h
templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
templates.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
templates.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
templates.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
templates.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
templates.o: ../../pikotools/space/spaceparser.h
templates.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
templates.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
templates.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
templates.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
templates.o: ../../pikotools/textstream/textstream.h
templates.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
@@ -1479,15 +1482,17 @@ textextstream.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h
textextstream.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
textextstream.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
textextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
textextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
textextstream.o: ../../ezc/src/patternparser.h htmltextstream.h
textextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
textextstream.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
textextstream.o: htmltextstream.h
upload.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h
upload.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
upload.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
upload.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
upload.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
upload.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
upload.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
upload.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
upload.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
upload.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
upload.o: ../../pikotools/textstream/types.h
upload.o: ../../pikotools/textstream/textstream.h
upload.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
upload.o: ../../pikotools/convert/convert.h
@@ -1533,10 +1538,10 @@ upload.o: ../../winix/core/htmlfilter.h
uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
uptime.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
uptime.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
uptime.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
uptime.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
uptime.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
uptime.o: ../../pikotools/textstream/types.h
uptime.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
uptime.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
uptime.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
uptime.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
uptime.o: ../../pikotools/textstream/textstream.h
uptime.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
uptime.o: ../../pikotools/convert/convert.h
@@ -1582,10 +1587,10 @@ uptime.o: ../../winix/core/htmlfilter.h
user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
user.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
user.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
user.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
user.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
user.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
user.o: ../../pikotools/textstream/types.h
user.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
user.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
user.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
user.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
user.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
user.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
user.o: ../../pikotools/convert/inttostr.h
@@ -1629,10 +1634,10 @@ user.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
who.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
who.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
who.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
who.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
who.o: ../../pikotools/textstream/types.h
who.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
who.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
who.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
who.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
who.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
who.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
who.o: ../../pikotools/convert/inttostr.h
@@ -1676,10 +1681,10 @@ who.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
winix.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
winix.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
winix.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
winix.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
winix.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
winix.o: ../../pikotools/textstream/types.h
winix.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
winix.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
winix.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
winix.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
winix.o: ../../pikotools/textstream/textstream.h
winix.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
winix.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h

11
templates/insert.cpp
View File

@@ -73,15 +73,8 @@ void insert_page_run(Info & i)
insert_page_cur += 1;
info.run_content.Clear();
info.ezc_gen.TrimWhite(gen_trim_white);
info.ezc_gen.SkipNewLine(gen_skip_new_line);
info.ezc_gen.RecognizeSpecialChars(gen_use_special_chars);
info.ezc_gen.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
/*
* !! IMPROVE ME
* add blocks and variables
* hmm may they are not needed here?
*/
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);

20
templates/item.cpp
View File

@@ -332,15 +332,7 @@ void item_run(Info & i)
Ezc::Pattern * p = pattern_cacher.GetPattern(cur->request->item);
item_run_content.Clear();
ezc_generator.TrimWhite(gen_trim_white);
ezc_generator.SkipNewLine(gen_skip_new_line);
ezc_generator.RecognizeSpecialChars(gen_use_special_chars);
ezc_generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
/*
* !! IMPROVE ME
* add blocks and variables
* hmm may they are not needed here?
*/
InitGenerator(ezc_generator);
ezc_generator.SetPattern(*p);
ezc_generator.Generate(item_run_content);
@@ -735,15 +727,7 @@ void item_tab_run(Info & i)
{
Ezc::Pattern * p = pattern_cacher.GetPattern(cur->request->item_tab[item_index]);
item_run_content.Clear();
ezc_generator.TrimWhite(gen_trim_white);
ezc_generator.SkipNewLine(gen_skip_new_line);
ezc_generator.RecognizeSpecialChars(gen_use_special_chars);
ezc_generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
/*
* !! IMPROVE ME
* add blocks and variables
* hmm may they are not needed here?
*/
InitGenerator(ezc_generator);
ezc_generator.SetPattern(*p);
ezc_generator.Generate(item_run_content);
item_print_content(i.out, item_run_content.Str(), cur->request->item_tab[item_index].content_type);

25
templates/misc.cpp
View File

@@ -45,6 +45,9 @@ namespace Winix
namespace TemplatesFunctions
{
extern EzcFun ezc_functions;
extern Ezc::Blocks ezc_blocks;
void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in)
@@ -88,6 +91,28 @@ int was_enter = 0; // how many enteres there were before
void InitGenerator(EzcGen & gen)
{
gen.TrimWhite(gen_trim_white);
gen.SkipNewLine(gen_skip_new_line);
gen.RecognizeSpecialChars(gen_use_special_chars);
gen.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
gen.SetCommentary(config->ezc_error_prefix, config->ezc_error_postfix);
/*
* although we have addresses to blocks and functions cached in patters
* we have to provide it here because they will be used for variables
* if a variable is an alias e.g. [def variable function]
*/
gen.SetBlocks(ezc_blocks);
gen.SetFunctions(ezc_functions);
}
void print_hour_min(Info & i, time_t time)
{
char buffer[100];

2
templates/misc.h
View File

@@ -63,6 +63,8 @@ HtmlTextStream::RawText<RawType> R(const RawType & par)
}
void InitGenerator(EzcGen & gen);
void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in);
void print_hour_min(Info & i, time_t time);

50
templates/patterncacher.cpp
View File

@@ -42,7 +42,8 @@ PatternCacher::PatternCacher()
{
when_delete_patterns = 13;
how_many_delete = 3;
ezc_fun = 0;
ezc_fun = 0;
ezc_blocks = 0;
}
@@ -52,6 +53,16 @@ void PatternCacher::SetEzcFunctions(TemplatesFunctions::EzcFun * fun)
}
void PatternCacher::SetEzcBlocks(Ezc::Blocks * blocks)
{
ezc_blocks = blocks;
}
void PatternCacher::SetEzcCommentary(const std::wstring & start, const std::wstring & end)
{
pattern_parser.SetCommentary(start, end);
}
void PatternCacher::SetWhenDelete(size_t when_delete, size_t how_many_del)
{
when_delete_patterns = when_delete;
@@ -97,30 +108,30 @@ void PatternCacher::DeleteOldPatterns()
void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern)
{
/*
* CHECK ME
* check the rest flags from pattern_parser
* if the default values are correct
* we do not set pattern_parser.SetBlocks()
* blocks cannot be created in patterns generated from virtual FS
* but we can call other blocks (from normal templates)
*
* IMPROVE ME
* we can add blocks and variables
*
* add caching of blocks
* pattern_parser.SetCommentary() is set beforehand
*/
pattern_parser.AllowInclude(false);
pattern_parser.DeleteWhiteTextItems(false);
pattern_parser.ParseString(item.content, pattern);
if( ezc_fun )
pattern.CacheFunctions(*ezc_fun);
RebuildCache(pattern);
}
Ezc::Pattern * PatternCacher::AddPattern(const Item & item)
{
// don't call DeleteOldPatterns() here
// because you can delete a pattern which is in use
// (think about ezc functions: item run, insert_page etc)
// ezc functions such as: item_run, insert_page etc
// are using GetPattern() method which can call this method
PatternUsed pu;
@@ -196,6 +207,23 @@ size_t PatternCacher::Size()
}
void PatternCacher::RebuildCache(Ezc::Pattern & pattern)
{
pattern.ClearCache();
if( ezc_fun )
pattern.CacheFunctions(*ezc_fun);
if( ezc_blocks )
pattern.CacheBlocks(*ezc_blocks);
}
void PatternCacher::RebuildCache()
{
for(size_t i=0 ; i<pattern_tab.size() ; ++i)
RebuildCache(pattern_tab[i].pattern);
}
} // namespace Winix

20
templates/patterncacher.h
View File

@@ -59,8 +59,18 @@ public:
// and then we are deleting 'how_many_del' patterns
void SetWhenDelete(size_t when_delete, size_t how_many_del);
// remembering a pointer to ezc functions
// this functions (pointers to them) will be cached in patterns
void SetEzcFunctions(TemplatesFunctions::EzcFun * fun);
// remembering a pointer to ezc blocks
// this blocks (pointers to them) will be cached in patterns
void SetEzcBlocks(Ezc::Blocks * blocks);
// commentary prefix/postfix used in pattern_parser
// (when there is an error)
void SetEzcCommentary(const std::wstring & start, const std::wstring & end);
// returning a pattern corresponding to the 'item'
Ezc::Pattern * GetPattern(const Item & item);
@@ -79,6 +89,9 @@ public:
// size of the current cache in use
size_t Size();
// rebuild cache in all patterns
void RebuildCache();
private:
@@ -118,12 +131,17 @@ private:
// how many items to delete
size_t how_many_delete;
// can be null (not set directly)
// can be null
TemplatesFunctions::EzcFun * ezc_fun;
// can be null
Ezc::Blocks * ezc_blocks;
// parser for patterns
Ezc::PatternParser pattern_parser;
void RebuildCache(Ezc::Pattern & pattern);
};

53
templates/patterns.cpp
View File

@@ -44,6 +44,7 @@ Patterns::Patterns()
{
del_white_items = false;
ezc_fun = 0;
ezc_blocks = 0;
locale = 0;
locale_filter = 0;
}
@@ -84,6 +85,18 @@ void Patterns::SetEzcFunctions(TemplatesFunctions::EzcFun * fun)
}
void Patterns::SetEzcBlocks(Ezc::Blocks * blocks)
{
ezc_blocks = blocks;
}
void Patterns::SetEzcCommentary(const std::wstring & start, const std::wstring & end)
{
pattern_parser.SetCommentary(start, end);
}
size_t Patterns::Add(const wchar_t * file_name, bool read_pattern)
{
for(size_t i=0 ; i<pat_tab.size() ; ++i)
@@ -121,30 +134,44 @@ void Patterns::ReadPatterns(Template & templ)
templ.patterns.resize(len);
/*
* CHECK ME
* make sure everything else is set correctly from pattern_parser
* (default values)
* pattern_parser.SetCommentary() is set beforehand
*/
pattern_parser.DeleteWhiteTextItems(del_white_items);
pattern_parser.Directory(templates_dir, templates_dir_def);
if( ezc_blocks )
pattern_parser.SetBlocks(*ezc_blocks);
for(size_t i=0 ; i<len ; ++i)
{
pattern_parser.ParseFile(templ.file_name, templ.patterns[i]);
if( ezc_fun )
templ.patterns[i].CacheFunctions(*ezc_fun);
/*
* IMPROVE ME
* add caching blocks
*/
locale_filter->Filter(templ.patterns[i], *locale, i);
}
}
// caching should be done after all patterns are read
// because patterns can define blocks
void Patterns::RebuildCache()
{
for(size_t a = 0 ; a < pat_tab.size() ; ++a)
{
for(size_t b = 0 ; b < pat_tab[a].patterns.size() ; ++b)
{
Ezc::Pattern & pat = pat_tab[a].patterns[b];
pat.ClearCache();
if( ezc_fun )
pat.CacheFunctions(*ezc_fun);
if( ezc_blocks )
pat.CacheBlocks(*ezc_blocks);
}
}
}
Ezc::Pattern * Patterns::Get(size_t index, size_t lang_id)
{
@@ -174,6 +201,8 @@ void Patterns::Reload()
for(size_t i=0 ; i<pat_tab.size() ; ++i)
if( pat_tab[i].references > 0 )
ReadPatterns(pat_tab[i]);
RebuildCache();
}

39
templates/patterns.h
View File

@@ -61,12 +61,29 @@ public:
void SetLocaleFilter(LocaleFilter * plocale_filter);
/*
setting ezc functions
you don't have to call this method
(in such a case functions will be search with O(log) by the Generator)
remembering a pointer to ezc functions
this functions (pointers to them) will be cached in patterns
this caching will be done when a pattern is read from the hard drive
so you have to call this method before
*/
void SetEzcFunctions(TemplatesFunctions::EzcFun * fun);
/*
remembering a pointer to ezc blocks
this blocks (pointers to them) will be cached in patterns
this caching will be done when a pattern is read from the hard drive
so you have to call this method before
*/
void SetEzcBlocks(Ezc::Blocks * blocks);
/*
commentary prefix/postfix used in pattern_parser
(when there is an error)
*/
void SetEzcCommentary(const std::wstring & start, const std::wstring & end);
/*
adding a new pattern and returning its index
@@ -75,8 +92,10 @@ public:
if read_pattern is false then the pattern is not read,
it will be read when you call Reload() method
after adding some new patterns you have to call RebuildCache() method
*/
size_t Add(const wchar_t * file_name, bool read_pattern = true);
size_t Add(const wchar_t * file_name, bool read_pattern = true);
size_t Add(const std::wstring & file_name, bool read_pattern = true);
@@ -107,7 +126,7 @@ public:
/*
reloading all patterns
reloading all patterns and rebuilding cache
*/
void Reload();
@@ -120,6 +139,13 @@ public:
size_t Size();
/*
* rebuilding the cache for functions and blocks
* you should call this method when you Add() new patterns
*/
void RebuildCache();
private:
bool del_white_items;
@@ -130,6 +156,9 @@ private:
// can be null (not set directly)
TemplatesFunctions::EzcFun * ezc_fun;
// can be null
Ezc::Blocks * ezc_blocks;
struct Template
{
bool to_delete;

49
templates/templates.cpp
View File

@@ -58,6 +58,7 @@ PatternCacher pattern_cacher; // patterns for user items (files with an exec
Locale locale;
EzcFun ezc_functions;
Ezc::Blocks ezc_blocks;
LocaleFilter locale_filter;
HTMLFilter html_filter;
@@ -157,16 +158,7 @@ Ezc::Pattern * p = 0;
if( p )
{
content_gen.TrimWhite(gen_trim_white);
content_gen.SkipNewLine(gen_skip_new_line);
content_gen.RecognizeSpecialChars(gen_use_special_chars);
content_gen.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
/*
* !! IMPROVE ME
* add blocks and variables
*/
//content_gen.AddFunctions();
InitGenerator(content_gen);
content_gen.SetPattern(*p);
content_gen.Generate(i.out);
}
@@ -852,11 +844,15 @@ using namespace TemplatesFunctions;
patterns.Clear();
index_patterns.Clear();
change_patterns.Clear();
ezc_blocks.Clear();
//a pattern cacher chyba tez powinien byc wyczyszczony (tylko tam jest jakies zabezpieczenie)
//bo moze miec skeszowane bloki....
pat_index = patterns.Add(config->templates_index);
pat_index_fullscreen = patterns.Add(L"index_fullscreen.html");
pat_err_404 = patterns.Add(L"err_404.html");
pat_err_per_denied = patterns.Add(L"err_per_denied.html");
pat_index_fullscreen = patterns.Add(L"index_fullscreen.html"); // !! IMPROVE ME name to the config
pat_err_404 = patterns.Add(L"err_404.html"); // !! IMPROVE ME name to the config
pat_err_per_denied = patterns.Add(L"err_per_denied.html"); // !! IMPROVE ME name to the config
ReadTemplatesForFunctions();
ReadIndexTemplates();
@@ -864,6 +860,11 @@ using namespace TemplatesFunctions;
plugin.Call((Session*)0, WINIX_ADD_TEMPLATE);
patterns.RebuildCache();
ezc_blocks.CacheBlocks(ezc_blocks);
ezc_blocks.CacheFunctions(ezc_functions);
pattern_cacher.RebuildCache();
SetHtmlFilter();
log << log3 << "Templates: there are " << patterns.Size() << " patterns"
@@ -881,8 +882,10 @@ void Templates::Init()
using namespace TemplatesFunctions;
patterns.SetDirectories(config->templates_dir, config->templates_dir_default);
patterns.SetEzcCommentary(config->ezc_error_prefix, config->ezc_error_postfix);
pattern_cacher.SetWhenDelete(config->pattern_cacher_when_delete, config->pattern_cacher_how_many_delete);
pattern_cacher.SetEzcCommentary(config->ezc_error_prefix, config->ezc_error_postfix);
CreateFunctions(); // create functions first (functions will be cached by patterns)
ReadTemplates();
}
@@ -974,15 +977,8 @@ using namespace TemplatesFunctions;
if( index )
{
generator.TrimWhite(gen_trim_white);
generator.SkipNewLine(gen_skip_new_line);
generator.RecognizeSpecialChars(gen_use_special_chars);
generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
InitGenerator(generator);
generator.SetPattern(*index);
/*
* !! IMPROVE ME
* add blocks and variables
*/
generator.Generate(cur->request->out_streams);
}
else
@@ -1018,15 +1014,8 @@ void Templates::Generate(Ezc::Pattern & pattern)
{
using namespace TemplatesFunctions;
generator.TrimWhite(gen_trim_white);
generator.SkipNewLine(gen_skip_new_line);
generator.RecognizeSpecialChars(gen_use_special_chars);
generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
InitGenerator(generator);
generator.SetPattern(pattern);
/*
* !! IMPROVE ME
* add blocks and variables
*/
generator.Generate(cur->request->out_streams);
}
@@ -1074,11 +1063,13 @@ Templates::Templates()
using namespace TemplatesFunctions;
patterns.SetEzcFunctions(&ezc_functions);
patterns.SetEzcBlocks(&ezc_blocks);
patterns.SetLocale(&locale);
patterns.SetLocaleFilter(&locale_filter);
index_patterns.SetPatterns(&patterns);
change_patterns.SetPatterns(&patterns);
pattern_cacher.SetEzcFunctions(&ezc_functions);
pattern_cacher.SetEzcBlocks(&ezc_blocks);
}