Author: cito Date: Sat Jan 5 14:23:47 2013 New Revision: 491 Log: Revert hack in r488. It does not work with a Japanese locale.
Modified:
trunk/module/pgmodule.c
Modified: trunk/module/pgmodule.c
==============================================================================
--- trunk/module/pgmodule.c Sat Jan 5 10:54:12 2013 (r490)
+++ trunk/module/pgmodule.c Sat Jan 5 14:23:47 2013 (r491)
@@ -2143,7 +2143,7 @@
{
int k;
char *s = PQgetvalue(self->result, i, j);
- char cashbuf[64], cashdec, *t;
+ char cashbuf[64];
PyObject *tmp_obj;
if (PQgetisnull(self->result, i, j))
@@ -2169,23 +2169,12 @@
break;
case 5: /* money */
- cashdec = '.';
- for (t = s + strlen(s) - 1; t
>= s; t--)
- {
- if (*t == '.' || *t ==
',')
- {
- cashdec = *t;
- break;
- }
- }
- for (k = 0; *s &&
- k < sizeof(cashbuf) /
sizeof(cashbuf[0]) - 1;
+ for (k = 0;
+ *s && k <
sizeof(cashbuf) / sizeof(cashbuf[0]) - 1;
s++)
{
- if (isdigit(*s))
+ if (isdigit(*s) || *s
== '.')
cashbuf[k++] =
*s;
- else if (*s == cashdec)
- cashbuf[k++] =
'.';
else if (*s == '(' ||
*s == '-')
cashbuf[k++] =
'-';
}
@@ -2279,7 +2268,7 @@
{
int k;
char *s = PQgetvalue(self->result, i, j);
- char cashbuf[64], cashdec, *t;
+ char cashbuf[64];
PyObject *tmp_obj;
if (PQgetisnull(self->result, i, j))
@@ -2305,23 +2294,12 @@
break;
case 5: /* money */
- cashdec = '.';
- for (t = s + strlen(s) - 1; t
>= s; t--)
- {
- if (*t == '.' || *t ==
',')
- {
- cashdec = *t;
- break;
- }
- }
- for (k = 0; *s &&
- k < sizeof(cashbuf) /
sizeof(cashbuf[0]) - 1;
+ for (k = 0;
+ *s && k <
sizeof(cashbuf) / sizeof(cashbuf[0]) - 1;
s++)
{
- if (isdigit(*s))
+ if (isdigit(*s) || *s
== '.')
cashbuf[k++] =
*s;
- else if (*s == cashdec)
- cashbuf[k++] =
'.';
else if (*s == '(' ||
*s == '-')
cashbuf[k++] =
'-';
}
_______________________________________________
PyGreSQL mailing list
PyGreSQL@Vex.Net
https://mail.vex.net/mailman/listinfo.cgi/pygresql
