crtxcr/qswiki
1
0
Fork 0
Code Issues 21 Pull Requests 1 Releases Activity

HandlerPageView: Parse dynamically included pages recursively

Browse Source
This commit is contained in:
Albert S. 2022-03-28 21:25:37 +02:00
parent ba06d04a08
commit 03c5646858
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dynamic/dynamiccontentincludepage.cpp
View File

@ -6,9 +6,7 @@ std::string DynamicContentIncludePage::render()
auto rev = revisionDao->getCurrentForPage(this->argument); auto rev = revisionDao->getCurrentForPage(this->argument);
if(rev) if(rev)
{ {
Parser parser; return rev->content;
auto result = parser.parse(*this->database->createPageDao(), *this->urlProvider, rev->content);
return result;
} }
return {}; return {};
} }

4
handlers/handlerpageview.cpp
View File

@ -137,6 +137,8 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
std::string indexcontent; std::string indexcontent;
std::string parsedcontent; std::string parsedcontent;
bool keepParsing = true;
std::function<std::string(std::string_view, std::string_view)> dynamicParseCallback = std::function<std::string(std::string_view, std::string_view)> dynamicParseCallback =
[&](std::string_view key, std::string_view value) -> std::string [&](std::string_view key, std::string_view value) -> std::string
{ {
@ -150,7 +152,7 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
{ {
std::shared_ptr<DynamicContentIncludePage> includePage = createDynamic<DynamicContentIncludePage>(); std::shared_ptr<DynamicContentIncludePage> includePage = createDynamic<DynamicContentIncludePage>();
includePage->setArgument(std::string(value)); includePage->setArgument(std::string(value));
return includePage->render(); return parser.parse(pageDao, *this->urlProvider, includePage->render(), dynamicParseCallback);
} }
return std::string{}; return std::string{};
}; };