fixed: as we have insert_page ezc function now

we cannot delete ezc patterns when PatternCacher::GetPattern() method is called
       because we can delete a pattern which is in use
       now deleting is performed at the end of a request


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@751 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2011-07-15 02:09:02 +00:00
parent 1812a2e9ad
commit c37c1ff812
9 changed files with 108 additions and 54 deletions

View File

@@ -41,7 +41,7 @@ void insert_page_run(Info & i)
InsertPageInfo & info = insert_page_info[insert_page_cur];
Ezc::Pattern * pat = pattern_cacher.GetPattern(info.item);
log << "insert page: using " << insert_page_cur << " generator" << logend;
log << log4 << "Templates: insert_page_run: using " << insert_page_cur << " generator" << logend;
insert_page_cur += 1;
info.run_content.Clear();
@@ -58,8 +58,6 @@ bool insert_page_init(const std::wstring & path)
if( path.empty() )
return false;
log << "insert page: " << path << logend;
if( insert_page_reqid != cur->request->id )
{
insert_page_reqid = cur->request->id;
@@ -68,7 +66,7 @@ bool insert_page_init(const std::wstring & path)
if( insert_page_cur >= WINIX_TEMPLATES_INSERT_PAGE_MAX )
{
log << log1 << "Templates: insert_page: maximum nested insert_page exceeded" << logend;
log << log1 << "Templates: insert_page: maximum nested insert_page functions exceeded" << logend;
return false;
}