diff options
| -rw-r--r-- | UPGRADE.txt | 5 | ||||
| -rw-r--r-- | cdr/cdr_pgsql.c | 21 | ||||
| -rw-r--r-- | configs/cdr_pgsql.conf.sample | 1 |
3 files changed, 26 insertions, 1 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index da1362554..59028d714 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -215,6 +215,11 @@ From 1.6.1 to 1.6.2: * The cdr.conf file must exist and be configured correctly in order for CDR records to be written. +* cdr_pgsql now assumes the encoding of strings it is handed are in LATIN9, + which should cover most uses of the extended ASCII set. If your strings + use a different encoding in Asterisk, the "encoding" parameter may be set + to specify the correct character set. + From 1.6.0.1 to 1.6.1: * The ast_agi_register_multiple() and ast_agi_unregister_multiple() diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index 83c7d2e82..ee5842d15 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -52,7 +52,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static const char name[] = "pgsql"; static const char config[] = "cdr_pgsql.conf"; -static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword = NULL, *pgdbport = NULL, *table = NULL; +static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword = NULL, *pgdbport = NULL, *table = NULL, *encoding = NULL; static int connected = 0; static int maxsize = 512, maxsize2 = 512; @@ -110,6 +110,9 @@ static int pgsql_log(struct ast_cdr *cdr) conn = PQsetdbLogin(pghostname, pgdbport, NULL, NULL, pgdbname, pgdbuser, pgpassword); if (PQstatus(conn) != CONNECTION_BAD) { connected = 1; + if (PQsetClientEncoding(conn, encoding)) { + ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default '%s'\n", encoding, pg_encoding_to_char(PQclientEncoding(conn))); + } } else { pgerror = PQerrorMessage(conn); ast_log(LOG_ERROR, "Unable to connect to database server %s. Calls will not be logged!\n", pghostname); @@ -449,6 +452,19 @@ static int config_module(int reload) return -1; } + if (!(tmp = ast_variable_retrieve(cfg, "global", "encoding"))) { + ast_log(LOG_WARNING, "Encoding not specified. Assuming LATIN9\n"); + tmp = "LATIN9"; + } + + if (encoding) { + ast_free(encoding); + } + if (!(encoding = ast_strdup(tmp))) { + ast_config_destroy(cfg); + return -1; + } + if (option_debug) { if (ast_strlen_zero(pghostname)) { ast_debug(1, "using default unix socket\n"); @@ -469,6 +485,9 @@ static int config_module(int reload) int i, rows, version; ast_debug(1, "Successfully connected to PostgreSQL database.\n"); connected = 1; + if (PQsetClientEncoding(conn, encoding)) { + ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default '%s'\n", encoding, pg_encoding_to_char(PQclientEncoding(conn))); + } version = PQserverVersion(conn); if (version >= 70300) { diff --git a/configs/cdr_pgsql.conf.sample b/configs/cdr_pgsql.conf.sample index 97efea65d..2c4666326 100644 --- a/configs/cdr_pgsql.conf.sample +++ b/configs/cdr_pgsql.conf.sample @@ -11,3 +11,4 @@ ;password=password ;user=postgres ;table=cdr ;SQL table where CDRs will be inserted +;encoding=LATIN9 ; Encoding of logged characters in Asterisk |