IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-16 18:25:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wrapqoflog' into maint

Browse Source
This commit is contained in:
Christopher Lam 2019-07-12 08:16:46 +08:00
commit 22f22b0a28
4 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libgnucash/engine/engine.i
View File

@ -24,6 +24,7 @@
#include <config.h> #include <config.h>
#include <glib.h> #include <glib.h>
#include "qof.h" #include "qof.h"
#include "qoflog.h"
#include "Query.h" #include "Query.h"
#include "gnc-budget.h" #include "gnc-budget.h"
#include "gnc-commodity.h" #include "gnc-commodity.h"
@ -83,6 +84,20 @@ engine-common.i */
%include "engine-common.i" %include "engine-common.i"
%include "engine-deprecated.h" %include "engine-deprecated.h"
#if defined(SWIGGUILE)
%ignore QofLogModule;
%typemap(in) QofLogModule {
$1 = (const char *)SWIG_scm2str($input);
}
%typemap(freearg) QofLogModule {
SWIG_free((char*)$1);
}
#endif
%include "qoflog.h"
%inline %{ %inline %{
static const GncGUID * gncPriceGetGUID(GNCPrice *x) static const GncGUID * gncPriceGetGUID(GNCPrice *x)
{ return qof_instance_get_guid(QOF_INSTANCE(x)); } { return qof_instance_get_guid(QOF_INSTANCE(x)); }
@ -325,6 +340,13 @@ void qof_book_set_string_option(QofBook* book, const char* opt_name, const char*
SET_ENUM("QOF-COMPARE-CONTAINS"); SET_ENUM("QOF-COMPARE-CONTAINS");
SET_ENUM("QOF-COMPARE-NCONTAINS"); SET_ENUM("QOF-COMPARE-NCONTAINS");
SET_ENUM("QOF-LOG-DEBUG");
SET_ENUM("QOF-LOG-FATAL");
SET_ENUM("QOF-LOG-ERROR");
SET_ENUM("QOF-LOG-WARNING");
SET_ENUM("QOF-LOG-MESSAGE");
SET_ENUM("QOF-LOG-INFO");
SET_ENUM("QOF-NUMERIC-MATCH-ANY"); SET_ENUM("QOF-NUMERIC-MATCH-ANY");
SET_ENUM("QOF-NUMERIC-MATCH-CREDIT"); SET_ENUM("QOF-NUMERIC-MATCH-CREDIT");
SET_ENUM("QOF-NUMERIC-MATCH-DEBIT"); SET_ENUM("QOF-NUMERIC-MATCH-DEBIT");

18
libgnucash/engine/qoflog.h
View File

@ -96,15 +96,15 @@ extern "C"
#define QOF_MOD_ENGINE "qof.engine" #define QOF_MOD_ENGINE "qof.engine"
#define LOG_LEVEL_LIST(_) \ typedef enum
_(QOF_LOG_FATAL, = G_LOG_LEVEL_ERROR) \ {
_(QOF_LOG_ERROR, = G_LOG_LEVEL_CRITICAL) \ QOF_LOG_FATAL = G_LOG_LEVEL_ERROR,
_(QOF_LOG_WARNING, = G_LOG_LEVEL_WARNING) \ QOF_LOG_ERROR = G_LOG_LEVEL_CRITICAL,
_(QOF_LOG_MESSAGE, = G_LOG_LEVEL_MESSAGE) \ QOF_LOG_WARNING = G_LOG_LEVEL_WARNING,
_(QOF_LOG_INFO, = G_LOG_LEVEL_INFO) \ QOF_LOG_MESSAGE = G_LOG_LEVEL_MESSAGE,
_(QOF_LOG_DEBUG, = G_LOG_LEVEL_DEBUG) QOF_LOG_INFO = G_LOG_LEVEL_INFO,
QOF_LOG_DEBUG = G_LOG_LEVEL_DEBUG
DEFINE_ENUM (QofLogLevel, LOG_LEVEL_LIST) } QofLogLevel;
const char* qof_log_level_to_string(QofLogLevel lvl); const char* qof_log_level_to_string(QofLogLevel lvl);
QofLogLevel qof_log_level_from_string(const char *str); QofLogLevel qof_log_level_from_string(const char *str);

2
libgnucash/scm/CMakeLists.txt
View File

@ -1,6 +1,6 @@
add_subdirectory(test) add_subdirectory(test)
set(GUILE_DEPENDS scm-core-utils scm-gnc-module) set(GUILE_DEPENDS scm-core-utils scm-gnc-module gncmod-engine)
gnc_add_scheme_targets(scm-scm gnc_add_scheme_targets(scm-scm

18
libgnucash/scm/utilities.scm
View File

@ -27,6 +27,10 @@
(use-modules (gnucash core-utils)) (use-modules (gnucash core-utils))
(eval-when (compile load eval expand)
(load-extension "libgncmod-engine" "scm_init_sw_engine_module"))
(use-modules (sw_engine))
;; Load the srfis (eventually, we should see where these are needed ;; Load the srfis (eventually, we should see where these are needed
;; and only have the use-modules statements in those files). ;; and only have the use-modules statements in those files).
(use-modules (srfi srfi-1)) (use-modules (srfi srfi-1))
@ -62,8 +66,18 @@
(define (gnc:msg . items) (define (gnc:msg . items)
(gnc-scm-log-msg (strify items))) (gnc-scm-log-msg (strify items)))
(define (gnc:debug . items) ;; this definition of gnc:debug is different from others because we
(gnc-scm-log-debug (strify items))) ;; want to check loglevel is debug *once* at gnc:debug definition
;; instead of every call to gnc:debug. if loglevel isn't debug then
;; gnc:debug becomes a NOOP.
(define gnc:debug
(cond
((qof-log-check "gnc" QOF-LOG-DEBUG)
(display "debugging enabled\n")
(lambda items (gnc-scm-log-debug (strify items))))
(else
(lambda items #f))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; the following functions are initialized to log message to tracefile ;; the following functions are initialized to log message to tracefile