From 35359f038f571dc46de3d14af72a2bc911fb0a24 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 18 Mar 2020 22:17:49 +0300
Subject: Implement brep-monitor

---
 mod/mod-build-task.cxx | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'mod/mod-build-task.cxx')

diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx
index c232815..17bc15e 100644
--- a/mod/mod-build-task.cxx
+++ b/mod/mod-build-task.cxx
@@ -22,14 +22,14 @@
 #include <libbbot/manifest.hxx>
 #include <libbbot/build-config.hxx>
 
-#include <web/module.hxx>
+#include <web/server/module.hxx>
 
 #include <libbrep/build.hxx>
 #include <libbrep/build-odb.hxx>
 #include <libbrep/build-package.hxx>
 #include <libbrep/build-package-odb.hxx>
 
-#include <mod/options.hxx>
+#include <mod/module-options.hxx>
 
 using namespace std;
 using namespace butl;
@@ -384,28 +384,18 @@ handle (request& rq, response& rs)
     using prep_bld_query = prepared_query<build>;
 
     package_id id;
-    const auto& qv (bld_query::id.package.version);
 
     bld_query bq (
-      bld_query::id.package.tenant == bld_query::_ref (id.tenant) &&
-
-      bld_query::id.package.name == bld_query::_ref (id.name)     &&
-
-      qv.epoch == bld_query::_ref (id.version.epoch)              &&
-      qv.canonical_upstream ==
-        bld_query::_ref (id.version.canonical_upstream)           &&
-      qv.canonical_release ==
-        bld_query::_ref (id.version.canonical_release) &&
-      qv.revision == bld_query::_ref (id.version.revision)        &&
+      equal<build> (bld_query::id.package, id)                   &&
 
       bld_query::id.configuration.in_range (cfg_names.begin (),
-                                            cfg_names.end ())     &&
+                                            cfg_names.end ())    &&
 
-      bld_query::id.toolchain_name == tqm.toolchain_name          &&
+      bld_query::id.toolchain_name == tqm.toolchain_name         &&
 
       compare_version_eq (bld_query::id.toolchain_version,
                           canonical_version (toolchain_version),
-                          true /* revision */)                    &&
+                          true /* revision */)                   &&
 
       (bld_query::state == "built" ||
        ((bld_query::force == "forcing" &&
-- 
cgit v1.1