mirror of
https://github.com/postgres/postgres.git
synced 2025-05-01 01:04:50 +03:00
227767112c
-------------------------------------------------------------------
Subject: Re: [PATCHES] encoding names
From: Karel Zak <zakkr@zf.jcu.cz>
To: Peter Eisentraut <peter_e@gmx.net>
Cc: pgsql-patches <pgsql-patches@postgresql.org>
Date: Fri, 31 Aug 2001 17:24:38 +0200
On Thu, Aug 30, 2001 at 01:30:40AM +0200, Peter Eisentraut wrote:
> > - convert encoding 'name' to 'id'
>
> I thought we decided not to add functions returning "new" names until we
> know exactly what the new names should be, and pending schema
Ok, the patch not to add functions.
> better
>
> ...(): encoding name too long
Fixed.
I found new bug in command/variable.c in parse_client_encoding(), nobody
probably never see this error:
if (pg_set_client_encoding(encoding))
{
elog(ERROR, "Conversion between %s and %s is not supported",
value, GetDatabaseEncodingName());
}
because pg_set_client_encoding() returns -1 for error and 0 as true.
It's fixed too.
IMHO it can be apply.
Karel
PS:
* following files are renamed:
src/utils/mb/Unicode/KOI8_to_utf8.map -->
src/utils/mb/Unicode/koi8r_to_utf8.map
src/utils/mb/Unicode/WIN_to_utf8.map -->
src/utils/mb/Unicode/win1251_to_utf8.map
src/utils/mb/Unicode/utf8_to_KOI8.map -->
src/utils/mb/Unicode/utf8_to_koi8r.map
src/utils/mb/Unicode/utf8_to_WIN.map -->
src/utils/mb/Unicode/utf8_to_win1251.map
* new file:
src/utils/mb/encname.c
* removed file:
src/utils/mb/common.c
--
Karel Zak <zakkr@zf.jcu.cz>
http://home.zf.jcu.cz/~zakkr/
C, PostgreSQL, PHP, WWW, http://docs.linux.cz, http://mape.jcu.cz
198 lines
3.5 KiB
C
198 lines
3.5 KiB
C
/* -----------------------------------------------------------------------
|
|
* ascii.c
|
|
*
|
|
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.9 2001/09/06 04:57:29 ishii Exp $
|
|
*
|
|
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
|
|
*
|
|
*
|
|
* TO_ASCII()
|
|
*
|
|
* The PostgreSQL routine for string to ascii conversion.
|
|
*
|
|
* -----------------------------------------------------------------------
|
|
*/
|
|
|
|
#include "postgres.h"
|
|
#include "utils/builtins.h"
|
|
#include "mb/pg_wchar.h"
|
|
#include "utils/ascii.h"
|
|
|
|
/* ----------
|
|
* even if MULTIBYTE is not enabled, these functions must exist
|
|
* since pg_proc.h has references to them.
|
|
* ----------
|
|
*/
|
|
#ifndef MULTIBYTE
|
|
|
|
static void multibyte_error(void);
|
|
|
|
static void
|
|
multibyte_error(void)
|
|
{
|
|
elog(ERROR, "Multi-byte support is not enabled");
|
|
}
|
|
|
|
Datum
|
|
to_ascii_encname(PG_FUNCTION_ARGS)
|
|
{
|
|
multibyte_error();
|
|
return 0; /* keep compiler quiet */
|
|
}
|
|
|
|
Datum
|
|
to_ascii_enc(PG_FUNCTION_ARGS)
|
|
{
|
|
multibyte_error();
|
|
return 0; /* keep compiler quiet */
|
|
}
|
|
|
|
Datum
|
|
to_ascii_default(PG_FUNCTION_ARGS)
|
|
{
|
|
multibyte_error();
|
|
return 0; /* keep compiler quiet */
|
|
}
|
|
|
|
|
|
#else /* with MULTIBYTE */
|
|
|
|
|
|
static text *encode_to_ascii(text *data, int enc);
|
|
|
|
/* ----------
|
|
* to_ascii
|
|
* ----------
|
|
*/
|
|
char *
|
|
pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int enc)
|
|
{
|
|
unsigned char *x = NULL;
|
|
unsigned char *ascii = NULL;
|
|
int range = 0;
|
|
|
|
/*
|
|
* relevant start for an encoding
|
|
*/
|
|
#define RANGE_128 128
|
|
#define RANGE_160 160
|
|
|
|
|
|
if (enc == PG_LATIN1)
|
|
{
|
|
|
|
/*
|
|
* ISO-8859-1 <range: 160 -- 255>
|
|
*/
|
|
ascii = " cL Y \"Ca -R 'u ., ?AAAAAAACEEEEIIII NOOOOOxOUUUUYTBaaaaaaaceeeeiiii nooooo/ouuuuyty";
|
|
range = RANGE_160;
|
|
}
|
|
else if (enc == PG_LATIN2)
|
|
{
|
|
|
|
/*
|
|
* ISO-8859-2 <range: 160 -- 255>
|
|
*/
|
|
ascii = " A L LS \"SSTZ-ZZ a,l'ls ,sstz\"zzRAAAALCCCEEEEIIDDNNOOOOxRUUUUYTBraaaalccceeeeiiddnnoooo/ruuuuyt.";
|
|
range = RANGE_160;
|
|
}
|
|
else if (enc == PG_WIN1250)
|
|
{
|
|
|
|
/*
|
|
* Window CP1250 <range: 128 -- 255>
|
|
*/
|
|
ascii = " ' \" %S<STZZ `'\"\".-- s>stzz L A \"CS -RZ ,l'u .,as L\"lzRAAAALCCCEEEEIIDDNNOOOOxRUUUUYTBraaaalccceeeeiiddnnoooo/ruuuuyt ";
|
|
range = RANGE_128;
|
|
}
|
|
else
|
|
{
|
|
elog(ERROR, "pg_to_ascii(): unsupported encoding from %s",
|
|
pg_encoding_to_char(enc));
|
|
}
|
|
|
|
/*
|
|
* Encode
|
|
*/
|
|
for (x = src; x <= src_end; x++)
|
|
{
|
|
if (*x < 128)
|
|
*desc++ = *x;
|
|
else if (*x < range)
|
|
*desc++ = ' '; /* bogus 128 to 'range' */
|
|
else
|
|
*desc++ = ascii[*x - range];
|
|
}
|
|
|
|
return desc;
|
|
}
|
|
|
|
/* ----------
|
|
* encode text
|
|
* ----------
|
|
*/
|
|
static text *
|
|
encode_to_ascii(text *data, int enc)
|
|
{
|
|
pg_to_ascii(
|
|
(unsigned char *) VARDATA(data), /* src */
|
|
VARDATA(data) + VARSIZE(data), /* src end */
|
|
(unsigned char *) VARDATA(data), /* desc */
|
|
enc); /* encoding */
|
|
|
|
return data;
|
|
}
|
|
|
|
/* ----------
|
|
* convert to ASCII - enc is set as 'name' arg.
|
|
* ----------
|
|
*/
|
|
Datum
|
|
to_ascii_encname(PG_FUNCTION_ARGS)
|
|
{
|
|
PG_RETURN_TEXT_P
|
|
(
|
|
encode_to_ascii
|
|
(
|
|
PG_GETARG_TEXT_P_COPY(0),
|
|
pg_char_to_encoding(NameStr(*PG_GETARG_NAME(1)))
|
|
)
|
|
);
|
|
}
|
|
|
|
/* ----------
|
|
* convert to ASCII - enc is set as int4
|
|
* ----------
|
|
*/
|
|
Datum
|
|
to_ascii_enc(PG_FUNCTION_ARGS)
|
|
{
|
|
PG_RETURN_TEXT_P
|
|
(
|
|
encode_to_ascii
|
|
(
|
|
PG_GETARG_TEXT_P_COPY(0),
|
|
PG_GETARG_INT32(1)
|
|
)
|
|
);
|
|
}
|
|
|
|
/* ----------
|
|
* convert to ASCII - current enc is DatabaseEncoding
|
|
* ----------
|
|
*/
|
|
Datum
|
|
to_ascii_default(PG_FUNCTION_ARGS)
|
|
{
|
|
PG_RETURN_TEXT_P
|
|
(
|
|
encode_to_ascii
|
|
(
|
|
PG_GETARG_TEXT_P_COPY(0),
|
|
GetDatabaseEncoding()
|
|
)
|
|
);
|
|
}
|
|
|
|
#endif /* MULTIBYTE */
|