From 08ef171b0c5b9238df9fe0b86200a8d8425dcea5 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 6 Oct 2015 12:38:11 +0200 Subject: Get rid of package class --- brep/package-search.cxx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'brep/package-search.cxx') diff --git a/brep/package-search.cxx b/brep/package-search.cxx index 9b3fb2c..cc15e02 100644 --- a/brep/package-search.cxx +++ b/brep/package-search.cxx @@ -91,7 +91,7 @@ namespace brep // @@ Query will include search criteria if specified. // - size_t pc (db_->query_value ().count); + size_t pc (db_->query_value ()); s << DIV(ID="packages") << "Packages (" << pc << ")" << ~DIV; @@ -100,20 +100,19 @@ namespace brep using query = query; auto r ( - db_->query ( - "ORDER BY" + query::package::name + + db_->query (query (true) + + "ORDER BY" + query::package_version::id.data.package + "OFFSET" + to_string (pr.page () * rop) + "LIMIT" + to_string (rop))); for (const auto& ip: r) { - const package& p = *ip.package; - const package_version& v = *ip.version; + const package_version& v (ip); s << DIV(CLASS="package") << DIV(CLASS="name") << A - << HREF << "/go/" << mime_url_encode (p.name); + << HREF << "/go/" << mime_url_encode (v.name); // Propagate search criteria to the package version search url. // @@ -121,11 +120,11 @@ namespace brep s << "?" << q; s << ~HREF - << p.name + << v.name << ~A << ~DIV - << DIV(CLASS="summary") << p.summary << ~DIV - << DIV_TAGS (p.tags) + << DIV(CLASS="summary") << v.summary << ~DIV + << DIV_TAGS (v.tags) << DIV_LICENSES (v.license_alternatives) << DIV(CLASS="dependencies") << "Dependencies: " << v.dependencies.size () -- cgit v1.1