diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-22 15:11:09 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-22 15:11:09 +0000 |
| commit | ad1c7b9b0940776b7d20169a355f0d1cab920861 (patch) | |
| tree | ca0a6cd49ead7fd93684ecd4946630fe8aa9d81b /cdr | |
| parent | 601fea83cc0a01366389c665ecec53c2949a75dc (diff) | |
Merged revisions 288265-288266 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r288265 | tilghman | 2010-09-22 09:48:04 -0500 (Wed, 22 Sep 2010) | 9 lines
Allow the encoding to be set, in case local charset does not agree with database.
(closes issue #16940)
Reported by: jamicque
Patches:
20100827__issue16940.diff.txt uploaded by tilghman (license 14)
20100921__issue16940__1.6.2.diff.txt uploaded by tilghman (license 14)
Tested by: jamicque
........
r288266 | tilghman | 2010-09-22 10:04:52 -0500 (Wed, 22 Sep 2010) | 5 lines
Document addition of encoding parameter.
(issue #16940)
Reported by: jamicque
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288267 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_pgsql.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index dc9b188cf..21370944f 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -54,7 +54,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static char *name = "pgsql"; static 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; @@ -112,6 +112,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); @@ -452,6 +455,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"); @@ -472,6 +488,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) { |