From eb3703c3236e3dd096631c783250014684980b6f Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Fri, 23 Nov 2018 17:13:50 +0000 Subject: [PATCH] updated to the new pikotools api (Logger -> Log) git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1150 e52654a7-88a9-db11-a3e9-0013d4bc506e --- src/Makefile.dep | 32 ++++++++++++------------ src/dbconnector.cpp | 12 ++++----- src/dbconnector.h | 8 +++--- src/modelconnector.cpp | 10 ++++---- src/modelconnector.h | 8 +++--- src/postgresqlconnector.cpp | 46 +++++++++++++++++------------------ src/postgresqlqueryresult.cpp | 2 +- 7 files changed, 60 insertions(+), 58 deletions(-) diff --git a/src/Makefile.dep b/src/Makefile.dep index 90d564a..71edde4 100644 --- a/src/Makefile.dep +++ b/src/Makefile.dep @@ -12,9 +12,9 @@ baseexpression.o: ../../pikotools/convert/misc.h baseexpression.o: ../../pikotools/membuffer/membuffer.h baseexpression.o: ../../pikotools/textstream/types.h morm_types.h model.h baseexpression.o: modelconnector.h clearer.h dbconnector.h -baseexpression.o: ../../pikotools/logger/logger.h queryresult.h -baseexpression.o: flatconnector.h dbexpression.h flatexpression.h -baseexpression.o: ../../pikotools/utf8/utf8.h +baseexpression.o: ../../pikotools/log/log.h ../../pikotools/log/filelog.h +baseexpression.o: queryresult.h flatconnector.h dbexpression.h +baseexpression.o: flatexpression.h ../../pikotools/utf8/utf8.h clearer.o: clearer.h ../../pikotools/date/date.h clearer.o: ../../pikotools/convert/convert.h clearer.o: ../../pikotools/convert/inttostr.h @@ -24,8 +24,9 @@ clearer.o: ../../pikotools/textstream/textstream.h clearer.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h clearer.o: ../../pikotools/membuffer/membuffer.h clearer.o: ../../pikotools/textstream/types.h modelconnector.h dbconnector.h -clearer.o: ../../pikotools/logger/logger.h queryresult.h flatconnector.h -clearer.o: dbexpression.h baseexpression.h morm_types.h flatexpression.h +clearer.o: ../../pikotools/log/log.h ../../pikotools/log/filelog.h +clearer.o: queryresult.h flatconnector.h dbexpression.h baseexpression.h +clearer.o: morm_types.h flatexpression.h dbconnector.o: dbconnector.h ../../pikotools/textstream/textstream.h dbconnector.o: ../../pikotools/space/space.h dbconnector.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h @@ -34,8 +35,8 @@ dbconnector.o: ../../pikotools/convert/inttostr.h dbconnector.o: ../../pikotools/convert/strtoint.h dbconnector.o: ../../pikotools/convert/text.h ../../pikotools/convert/misc.h dbconnector.o: ../../pikotools/membuffer/membuffer.h -dbconnector.o: ../../pikotools/textstream/types.h -dbconnector.o: ../../pikotools/logger/logger.h queryresult.h dbexpression.h +dbconnector.o: ../../pikotools/textstream/types.h ../../pikotools/log/log.h +dbconnector.o: ../../pikotools/log/filelog.h queryresult.h dbexpression.h dbconnector.o: baseexpression.h morm_types.h model.h modelconnector.h dbconnector.o: clearer.h flatconnector.h flatexpression.h dbconnector.o: ../../pikotools/utf8/utf8.h @@ -86,8 +87,8 @@ flatconnector.o: ../../pikotools/convert/misc.h flatconnector.o: ../../pikotools/membuffer/membuffer.h flatconnector.o: ../../pikotools/textstream/types.h flatexpression.h flatconnector.o: baseexpression.h morm_types.h model.h modelconnector.h -flatconnector.o: clearer.h dbconnector.h ../../pikotools/logger/logger.h -flatconnector.o: queryresult.h dbexpression.h +flatconnector.o: clearer.h dbconnector.h ../../pikotools/log/log.h +flatconnector.o: ../../pikotools/log/filelog.h queryresult.h dbexpression.h flatexpression.o: flatexpression.h baseexpression.h flatexpression.o: ../../pikotools/textstream/textstream.h flatexpression.o: ../../pikotools/space/space.h @@ -132,9 +133,9 @@ model.o: ../../pikotools/convert/inttostr.h model.o: ../../pikotools/convert/strtoint.h ../../pikotools/convert/text.h model.o: ../../pikotools/convert/misc.h ../../pikotools/membuffer/membuffer.h model.o: ../../pikotools/textstream/types.h modelconnector.h clearer.h -model.o: dbconnector.h ../../pikotools/logger/logger.h queryresult.h -model.o: flatconnector.h dbexpression.h baseexpression.h morm_types.h -model.o: flatexpression.h +model.o: dbconnector.h ../../pikotools/log/log.h +model.o: ../../pikotools/log/filelog.h queryresult.h flatconnector.h +model.o: dbexpression.h baseexpression.h morm_types.h flatexpression.h modelconnector.o: modelconnector.h clearer.h ../../pikotools/date/date.h modelconnector.o: ../../pikotools/convert/convert.h modelconnector.o: ../../pikotools/convert/inttostr.h @@ -146,8 +147,8 @@ modelconnector.o: ../../pikotools/space/space.h modelconnector.o: ../../pikotools/textstream/types.h modelconnector.o: ../../pikotools/membuffer/membuffer.h modelconnector.o: ../../pikotools/textstream/types.h -modelconnector.o: ../../pikotools/logger/logger.h queryresult.h -modelconnector.o: flatconnector.h +modelconnector.o: ../../pikotools/log/log.h ../../pikotools/log/filelog.h +modelconnector.o: queryresult.h flatconnector.h postgresqlconnector.o: postgresqlconnector.h dbconnector.h postgresqlconnector.o: ../../pikotools/textstream/textstream.h postgresqlconnector.o: ../../pikotools/space/space.h @@ -160,7 +161,8 @@ postgresqlconnector.o: ../../pikotools/convert/text.h postgresqlconnector.o: ../../pikotools/convert/misc.h postgresqlconnector.o: ../../pikotools/membuffer/membuffer.h postgresqlconnector.o: ../../pikotools/textstream/types.h -postgresqlconnector.o: ../../pikotools/logger/logger.h queryresult.h +postgresqlconnector.o: ../../pikotools/log/log.h +postgresqlconnector.o: ../../pikotools/log/filelog.h queryresult.h postgresqlconnector.o: postgresqlqueryresult.h ../../pikotools/utf8/utf8.h postgresqlconnector.o: postgresqlexpression.h dbexpression.h baseexpression.h postgresqlconnector.o: morm_types.h ../../pikotools/convert/strtoint.h diff --git a/src/dbconnector.cpp b/src/dbconnector.cpp index 85762d9..1b7b344 100644 --- a/src/dbconnector.cpp +++ b/src/dbconnector.cpp @@ -47,14 +47,14 @@ DbConnector::DbConnector() { db_expression = nullptr; expression_allocated = false; - logger = nullptr; + log = nullptr; } DbConnector::DbConnector(const DbConnector &) { db_expression = nullptr; expression_allocated = false; - logger = nullptr; + log = nullptr; } @@ -64,14 +64,14 @@ DbConnector::~DbConnector() } -void DbConnector::set_logger(PT::Logger * logger) +void DbConnector::set_logger(PT::Log * log) { - this->logger = logger; + this->log = log; } -void DbConnector::set_logger(PT::Logger & logger) +void DbConnector::set_logger(PT::Log & log) { - this->logger = &logger; + this->log = &log; } diff --git a/src/dbconnector.h b/src/dbconnector.h index d2d8cd3..34b7907 100644 --- a/src/dbconnector.h +++ b/src/dbconnector.h @@ -36,7 +36,7 @@ #define headerfile_morm_dbconnector #include "textstream/textstream.h" -#include "logger/logger.h" +#include "log/log.h" #include "queryresult.h" @@ -54,8 +54,8 @@ public: DbConnector(const DbConnector &); virtual ~DbConnector(); - virtual void set_logger(PT::Logger * logger); - virtual void set_logger(PT::Logger & logger); + virtual void set_logger(PT::Log * log); + virtual void set_logger(PT::Log & log); DbExpression * get_expression(); @@ -123,7 +123,7 @@ protected: DbExpression * db_expression; bool expression_allocated; - PT::Logger * logger; + PT::Log * log; virtual void allocate_default_expression() = 0; diff --git a/src/modelconnector.cpp b/src/modelconnector.cpp index 57cd36c..f73899f 100644 --- a/src/modelconnector.cpp +++ b/src/modelconnector.cpp @@ -44,7 +44,7 @@ ModelConnector::ModelConnector() flat_connector = nullptr; db_connector = nullptr; doc_connector = nullptr; - logger = nullptr; + log = nullptr; out_stream = nullptr; out_stream_allocated = false; @@ -61,14 +61,14 @@ ModelConnector::~ModelConnector() } -void ModelConnector::set_logger(PT::Logger * logger) +void ModelConnector::set_logger(PT::Log * log) { - this->logger = logger; + this->log = log; } -void ModelConnector::set_logger(PT::Logger & logger) +void ModelConnector::set_logger(PT::Log & log) { - this->logger = &logger; + this->log = &log; } diff --git a/src/modelconnector.h b/src/modelconnector.h index 8f2a71c..37dc15f 100644 --- a/src/modelconnector.h +++ b/src/modelconnector.h @@ -38,7 +38,7 @@ #include "clearer.h" #include "dbconnector.h" #include "flatconnector.h" -#include "logger/logger.h" +#include "log/log.h" namespace morm @@ -59,8 +59,8 @@ public: ModelConnector(const ModelConnector &) = delete; virtual ~ModelConnector(); - virtual void set_logger(PT::Logger * logger); - virtual void set_logger(PT::Logger & logger); + virtual void set_logger(PT::Log * log); + virtual void set_logger(PT::Log & log); virtual void set_stream(PT::TextStream & stream); @@ -82,7 +82,7 @@ public: protected: - PT::Logger * logger; + PT::Log * log; FlatConnector * flat_connector; DbConnector * db_connector; diff --git a/src/postgresqlconnector.cpp b/src/postgresqlconnector.cpp index f882554..1516ec0 100644 --- a/src/postgresqlconnector.cpp +++ b/src/postgresqlconnector.cpp @@ -95,9 +95,9 @@ bool PostgreSQLConnector::do_query(const char * query_str, PostgreSQLQueryResult { psql_result->clear(); - if( log_queries && logger ) + if( log_queries && log ) { - (*logger) << PT::Logger::log1 << "Db: executing query: " << query_str << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log1 << "Morm: query: " << query_str << PT::Log::logend; } psql_result->psql_result = PQexec(pg_conn, query_str); @@ -126,12 +126,12 @@ bool PostgreSQLConnector::do_query(const char * query_str, PostgreSQLQueryResult PT::UTF8ToWide(err_msg, psql_result->error_msg); } - if( logger ) + if( log ) { - (*logger) << PT::Logger::log1 << "Db: Problem with this query: \"" << query_str << '\"' << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log1 << "Morm: Problem with this query: \"" << query_str << '\"' << PT::Log::logend; if( err_msg ) - (*logger) << PT::Logger::log1 << "Db: " << err_msg << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log1 << "Morm: " << err_msg << PT::Log::logend; } } else @@ -173,19 +173,19 @@ const char * PostgreSQLConnector::query_last_sequence(const wchar_t * sequence_t } else { - if( logger ) + if( log ) { - (*logger) << PT::Logger::log1 << "Db: expected only one row in sequence result, has: " << psql_result.result_rows - << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log1 << "Morm: expected only one row in sequence result, has: " << psql_result.result_rows + << PT::Log::logend; } } } else { - if( pg_conn && logger ) + if( pg_conn && log ) { - (*logger) << PT::Logger::log1 << "Db: error (currval) for table: " << sequence_table_name << ", " - << PQerrorMessage(pg_conn) << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log1 << "Morm: error (currval) for table: " << sequence_table_name << ", " + << PQerrorMessage(pg_conn) << PT::Log::logend; } } } @@ -503,7 +503,7 @@ size_t i = 0; // // if( len < 2 || str[0]!='\\' || str[1]!='x' ) // { -// log << log1 << "Db: unsupported binary format (skipping)" << logend; +// log << log1 << "Morm: unsupported binary format (skipping)" << logend; // return; // } // @@ -579,10 +579,10 @@ void PostgreSQLConnector::connect() void PostgreSQLConnector::log_connection_socket() { - if( pg_conn && logger ) + if( pg_conn && log ) { - (*logger) << PT::Logger::log2 << "Db: connection to the database works fine" << PT::Logger::logend << PT::Logger::logsave; - (*logger) << PT::Logger::log3 << "Db: connection socket: " << PQsocket(pg_conn) << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log2 << "Morm: connection to the database works fine" << PT::Log::logend; + (*log) << PT::Log::log3 << "Morm: connection socket: " << PQsocket(pg_conn) << PT::Log::logend; } } @@ -590,9 +590,9 @@ void PostgreSQLConnector::wait_for_connection() { if( !pg_conn || PQstatus(pg_conn) != CONNECTION_OK ) { - if( logger ) + if( log ) { - (*logger) << PT::Logger::log3 << "Db: waiting for the db to be ready...." << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log3 << "Morm: waiting for the db to be ready...." << PT::Log::logend; } while( !assert_connection(false) ) @@ -621,9 +621,9 @@ bool was_connection = true; else if( PQstatus(pg_conn) != CONNECTION_OK ) { - if( put_log && logger ) + if( put_log && log ) { - (*logger) << PT::Logger::log2 << "Db: connection to the database is lost, trying to recover" << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log2 << "Morm: connection to the database is lost, trying to recover" << PT::Log::logend; } was_connection = false; @@ -645,9 +645,9 @@ bool was_connection = true; } else { - if( put_log && logger ) + if( put_log && log ) { - (*logger) << PT::Logger::log1 << "Db: connection to db server cannot be established" << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log1 << "Morm: connection to db server cannot be established" << PT::Log::logend; } // if( throw_if_no_connection ) @@ -666,9 +666,9 @@ void PostgreSQLConnector::set_db_parameters() { if( PQsetClientEncoding(pg_conn, "UTF8") == -1 ) { - if( logger ) + if( log ) { - (*logger) << PT::Logger::log1 << "Db: Can't set the proper client encoding" << PT::Logger::logend << PT::Logger::logsave; + (*log) << PT::Log::log1 << "Morm: Can't set the proper client encoding" << PT::Log::logend; } } } diff --git a/src/postgresqlqueryresult.cpp b/src/postgresqlqueryresult.cpp index 0489d58..bcb45d9 100644 --- a/src/postgresqlqueryresult.cpp +++ b/src/postgresqlqueryresult.cpp @@ -212,7 +212,7 @@ bool PostgreSQLQueryResult::is_null(int row, int col) // // if( status != PT::SpaceParser::ok ) // { -// log << log1 << "Db: a problem with parsing a PT::Space"; +// log << log1 << "Morm: a problem with parsing a PT::Space"; // // if( status == PT::SpaceParser::syntax_error ) // log << ", syntax error at line: " << conf_parser.line;