#3: Mechanism to control the crunchers.

trokam · Mar 2, 2018 · d026bb5 · d026bb5
1 parent 4df2369
commit d026bb5
Show file tree

Hide file tree

Showing 13 changed files with 374 additions and 61 deletions.
diff --git a/Makefile b/Makefile
@@ -51,6 +51,7 @@ BIN=./bin
 
 SOURCES_CRUNCHER= src/mainCruncher.cpp \
                   src/cruncher.cpp \
+                  src/control.cpp \
                   src/differentStrings.cpp \
                   src/exception.cpp \
                   src/fileOps.cpp \

diff --git a/db/control.dbm b/db/control.dbm
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+CAUTION: Do not modify this file unless you know what you are doing.
+         Unexpected results may occur if the code is changed deliberately.
+-->
+<dbmodel pgmodeler-ver="0.8.1" last-position="1,0" last-zoom="1"
+	 default-schema="public" default-owner="postgres">
+<database name="new_database">
+</database>
+
+<schema name="public" protected="true" fill-color="#e1e1e1" sql-disabled="true">
+</schema>
+
+<table name="command">
+	<schema name="public"/>
+	<role name="postgres"/>
+	<position x="117" y="77"/>
+	<column name="run" not-null="true">
+		<type name="bool"/>
+	</column>
+	<column name="active" not-null="true">
+		<type name="bool"/>
+	</column>
+</table>
+
+</dbmodel>
diff --git a/db/control.sql b/db/control.sql
@@ -0,0 +1,27 @@
+-- Database generated with pgModeler (PostgreSQL Database Modeler).
+-- pgModeler  version: 0.8.1
+-- PostgreSQL version: 9.4
+-- Project Site: pgmodeler.com.br
+-- Model Author: ---
+
+
+-- Database creation must be done outside an multicommand file.
+-- These commands were put in this file only for convenience.
+-- -- object: new_database | type: DATABASE --
+-- -- DROP DATABASE IF EXISTS new_database;
+-- CREATE DATABASE new_database
+-- ;
+-- -- ddl-end --
+-- 
+
+-- object: public.command | type: TABLE --
+-- DROP TABLE IF EXISTS public.command CASCADE;
+CREATE TABLE public.command(
+	run bool NOT NULL,
+	active bool NOT NULL
+);
+-- ddl-end --
+ALTER TABLE public.command OWNER TO postgres;
+-- ddl-end --
+
+
diff --git a/include/common.h b/include/common.h
@@ -43,6 +43,13 @@ const int DOMAIN_NO_INSERT =          0;
 const int DOMAIN_INSERT_SAME =        1;
 const int DOMAIN_INSERT_ALL =         2;
 
+/**
+ * Database IDs.
+ **/
+
+const int DB_TEXT_SEARCH =            7;
+const int DB_CONTROL =               11;
+
 /**
  * String literals.
  **/

diff --git a/include/control.h b/include/control.h
@@ -0,0 +1,56 @@
+/***********************************************************************
+ *                            T R O K A M
+ *                         Fair Search Engine
+ *
+ * Copyright (C) 2018, Nicolas Slusarenko
+ *                     [email protected]
+ *
+ * This file is part of Trokam.
+ *
+ * Trokam is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Trokam is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Trokam. If not, see <http://www.gnu.org/licenses/>.
+ **********************************************************************/
+
+#ifndef TROKAM_CONTROL_H
+#define TROKAM_CONTROL_H
+
+/// C++
+#include <string>
+
+/// Boost
+#include <boost/scoped_ptr.hpp>
+
+/// Trokam
+#include "reporting.h"
+#include "options.h"
+#include "postgresql.h"
+
+namespace Trokam
+{
+    class Control
+    {
+        public:
+
+            Control(const Trokam::Options &value);
+            bool run();
+            bool active();
+
+        private:
+
+            Trokam::Options settings;
+            Trokam::Postgresql db;
+            Trokam::Reporting msg;
+    };
+}
+
+#endif  /// TROKAM_INFOSTORE_H
diff --git a/include/cruncher.h b/include/cruncher.h
@@ -48,12 +48,13 @@ namespace Trokam
 
         private:
 
-            // int index;
-
+            int count;
             Trokam::Options settings;
             Trokam::InfoStore storage;
             Trokam::Reporting msg;
 
+            void process();
+
             void action(const int &index,
                         const int &error);
     };

diff --git a/include/options.h b/include/options.h
@@ -46,6 +46,12 @@ namespace Trokam
             std::string dbName() const;
             std::string dbUser() const;
             std::string dbPass() const;
+
+            std::string controlHost() const;
+            std::string controlName() const;
+            std::string controlUser() const;
+            std::string controlPass() const;
+
             std::string workingDir() const;
             std::string seedsFile() const;
             std::string contentDir() const;
@@ -55,10 +61,17 @@ namespace Trokam
             void deleteWorkingDirectory();
 
         private:
+
             std::string optDbHost;
             std::string optDbName;
             std::string optDbUser;
             std::string optDbPass;
+
+            std::string optControlHost;
+            std::string optControlName;
+            std::string optControlUser;
+            std::string optControlPass;
+
             std::string optWorkingDir;
             std::string optSeedsFile;
             std::string optContentDir;

diff --git a/include/postgresql.h b/include/postgresql.h
@@ -46,14 +46,24 @@ namespace Trokam
     {
         public:
 
-            Postgresql(const Trokam::Options &value);
+            // Postgresql(const Trokam::Options &value);
+            Postgresql(const Trokam::Options &value,
+                       const int &id);
+
             ~Postgresql();
 
             void execSql(const std::string &sentence);
-            void execSql(const std::string &sentence, boost::scoped_ptr<pqxx::result> &answer);
+
+            void execSql(const std::string &sentence,
+                         boost::scoped_ptr<pqxx::result> &answer);
+
             void execSql(std::vector<std::string> &bundle);
 
-            static void extract(const boost::scoped_ptr<pqxx::result> &answer, int &value);
+            static void extract(const boost::scoped_ptr<pqxx::result> &answer,
+                                int &value);
+
+            static void extract(const boost::scoped_ptr<pqxx::result> &answer,
+                                bool &value);
 
         private:
 

diff --git a/src/control.cpp b/src/control.cpp
@@ -0,0 +1,65 @@
+/***********************************************************************
+ *                            T R O K A M
+ *                         Fair Search Engine
+ *
+ * Copyright (C) 2018, Nicolas Slusarenko
+ *                     [email protected]
+ *
+ * This file is part of Trokam.
+ *
+ * Trokam is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Trokam is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Trokam. If not, see <http://www.gnu.org/licenses/>.
+ **********************************************************************/
+
+/// C++
+#include <string>
+#include <iostream>
+
+/// Trokam
+#include "common.h"
+#include "control.h"
+
+Trokam::Control::Control(const Trokam::Options &value): settings(value),
+                                                        db(value, DB_CONTROL),
+                                                        msg(value)
+{}
+
+bool Trokam::Control::run()
+{
+    bool state= false;
+
+    std::string sentence;
+    sentence=  "SELECT run ";
+    sentence+= "FROM command ";
+
+    boost::scoped_ptr<pqxx::result> answer;
+    db.execSql(sentence, answer);
+    Trokam::Postgresql::extract(answer, state);
+
+    return state;
+}
+
+bool Trokam::Control::active()
+{
+    bool state= false;
+
+    std::string sentence;
+    sentence=  "SELECT active ";
+    sentence+= "FROM command ";
+
+    boost::scoped_ptr<pqxx::result> answer;
+    db.execSql(sentence, answer);
+    Trokam::Postgresql::extract(answer, state);
+
+    return state;
+}