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

Database: PageDao/CategoryDao: Return 'Page' object, not pagename string

Browse Source
This commit is contained in:
Albert S.
2022-04-03 11:11:28 +02:00
parent 5f83981d68
commit 622ef5af6a
9 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cli.cpp
View File

@@ -141,10 +141,9 @@ std::pair<bool, std::string> CLIHandler::page_list([[maybe_unused]] const std::v
QueryOption o;
auto result = pageDao->getPageList(o);
std::stringstream stream;
for(std::string pagename : result)
for(Page &page : result)
{
Page p = pageDao->find(pagename).value();
stream << p.name << " " << p.pageid << " " << std::string(p.listed ? "listed" : "unlisted") << std::endl;
stream << page.name << " " << page.pageid << " " << std::string(page.listed ? "listed" : "unlisted") << std::endl;
}
return {true, stream.str()};
}
@@ -271,9 +270,9 @@ std::pair<bool, std::string> CLIHandler::category_show(const std::vector<std::st
auto categoryDao = this->db->createCategoryDao();
auto members = categoryDao->fetchMembers(args.at(0), QueryOption{});
std::stringstream stream;
for(std::string &member : members)
for(Page &member : members)
{
stream << member << std::endl;
stream << member.name << std::endl;
}
return {true, stream.str()};
}