From 6ce19c537bd9de8d3c9821841bc5ed680b762742 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 24 May 2018 00:25:45 +0300 Subject: Adapt to inventing package_name type --- mod/page.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'mod/page.cxx') diff --git a/mod/page.cxx b/mod/page.cxx index 706b42f..94e4f4f 100644 --- a/mod/page.cxx +++ b/mod/page.cxx @@ -188,7 +188,8 @@ namespace brep // Propagate search criteria to the package details page. // - << root_ / path (mime_url_encode (name_, false)) << query_param_ + << root_ / path (mime_url_encode (name_.string (), false)) + << query_param_ << ~HREF << name_ @@ -218,8 +219,9 @@ namespace brep else { assert (root_ != nullptr); - s << A(HREF=*root_ / dir_path (mime_url_encode (*package_, false)) / - path (version_)) + s << A(HREF=*root_ / + dir_path (mime_url_encode (package_->string (), false)) / + path (version_)) << version_; if (stub_) @@ -363,7 +365,7 @@ namespace brep // Suppress package name duplicates. // - set names; + set names; for (const auto& da: d) names.emplace (da.name ()); @@ -375,7 +377,7 @@ namespace brep bool first (true); for (const auto& da: d) { - string n (da.name ()); + package_name n (da.name ()); if (names.find (n) != names.end ()) { names.erase (n); @@ -393,7 +395,7 @@ namespace brep ? p->internal_repository.load () : p->other_repositories[0].load ()); - auto en (mime_url_encode (n, false)); + auto en (mime_url_encode (n.string (), false)); if (r->url) s << A(HREF=*r->url + en) << n << ~A; -- cgit v1.1