CVS update: php3/functions
| From: | jah | Date: | Sat, 19 Sep 1998 19:12:00 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1270@lists.php.net to get a copy of this message | ||
Date: Saturday September 19, 1998 @ 15:12
Author: jah
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv29269/functions
Modified Files:
ifx.ec php3_ifx.h
Log Message:
Added php3.ini option ifx.charasvarchar. Moved SQLNCHAR && SQLNVCHAR
outside of ifdef HAVE_IFX_IUS. They aren't IUS-specific.
Index: php3/functions/ifx.ec
diff -c php3/functions/ifx.ec:1.23 php3/functions/ifx.ec:1.24
*** php3/functions/ifx.ec:1.23 Fri Sep 18 09:23:44 1998
--- php3/functions/ifx.ec Sat Sep 19 15:11:57 1998
***************
*** 377,382 ****
--- 377,387 ----
Informix_GLOBAL(php3_ifx_module).byteasvarchar=0;
}
+ if (cfg_get_long("ifx.charasvarchar",
+ &Informix_GLOBAL(php3_ifx_module).charasvarchar)==FAILURE) {
+ Informix_GLOBAL(php3_ifx_module).charasvarchar=0;
+ }
+
if (cfg_get_long("ifx.nullformat",
&Informix_GLOBAL(php3_ifx_module).nullformat)==FAILURE) {
Informix_GLOBAL(php3_ifx_module).nullformat=0;
***************
*** 2044,2061 ****
ifx_int8toasc(&int8_var,string_data,200);
add_assoc_string(return_value, fieldname, string_data, DUP);
break;
- case SQLNCHAR :
- case SQLNVCHAR :
case SQLLVARCHAR:
case SQLBOOL:
$endif;
case SQLCHAR :
case SQLVCHAR :
if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
php3_error(E_WARNING, "Out of memory");
RETURN_FALSE;
}
EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :char_data = DATA;
add_assoc_string(return_value, fieldname, char_data, DUP);
efree(char_data);
char_data = NULL;
--- 2049,2070 ----
ifx_int8toasc(&int8_var,string_data,200);
add_assoc_string(return_value, fieldname, string_data, DUP);
break;
case SQLLVARCHAR:
case SQLBOOL:
$endif;
case SQLCHAR :
case SQLVCHAR :
+ case SQLNCHAR :
+ case SQLNVCHAR :
if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
php3_error(E_WARNING, "Out of memory");
RETURN_FALSE;
}
EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :char_data = DATA;
+ if (Informix_GLOBAL(php3_ifx_module).charasvarchar != 0
+ && (fieldtype == SQLCHAR || fieldtype == SQLNCHAR)) {
+ ldchar(char_data, fieldleng, char_data);
+ }
add_assoc_string(return_value, fieldname, char_data, DUP);
efree(char_data);
char_data = NULL;
***************
*** 2368,2378 ****
--- 2377,2393 ----
$endif;
case SQLCHAR :
case SQLVCHAR :
+ case SQLNCHAR :
+ case SQLNVCHAR :
if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
php3_error(E_WARNING, "Out of memory");
RETURN_FALSE;
}
EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :char_data = DATA;
+ if (Informix_GLOBAL(php3_ifx_module).charasvarchar != 0
+ && (fieldtype == SQLCHAR || fieldtype == SQLNCHAR)) {
+ ldchar(char_data, fieldleng, char_data);
+ }
php3_printf("<td>%s</td>", char_data);
efree(char_data);
char_data = NULL;
***************
*** 2819,2836 ****
case SQLBYTES :
char_data = "SQLBYTES";
break;
$ifdef HAVE_IFX_IUS;
case SQLUDTFIXED :
char_data = "SQLUDTFIXED";
break;
case SQLBOOL :
char_data = "SQLBOOL";
- break;
- case SQLNCHAR :
- char_data = "SQLNCHAR";
- break;
- case SQLNVCHAR :
- char_data = "SQLNVCHAR";
break;
case SQLINT8 :
char_data = "SQLINT8";
--- 2834,2851 ----
case SQLBYTES :
char_data = "SQLBYTES";
break;
+ case SQLNCHAR :
+ char_data = "SQLNCHAR";
+ break;
+ case SQLNVCHAR :
+ char_data = "SQLNVCHAR";
+ break;
$ifdef HAVE_IFX_IUS;
case SQLUDTFIXED :
char_data = "SQLUDTFIXED";
break;
case SQLBOOL :
char_data = "SQLBOOL";
break;
case SQLINT8 :
char_data = "SQLINT8";
Index: php3/functions/php3_ifx.h
diff -c php3/functions/php3_ifx.h:1.10 php3/functions/php3_ifx.h:1.11
*** php3/functions/php3_ifx.h:1.10 Tue Sep 15 17:46:55 1998
--- php3/functions/php3_ifx.h Sat Sep 19 15:11:59 1998
***************
*** 124,129 ****
--- 124,130 ----
long blobinfile; /* 0=save in memory, 1=save in file */
long textasvarchar; /* 0=as id, 1=as varchar */
long byteasvarchar; /* 0=as id, 1=as varchar */
+ long charasvarchar; /* 0=don't strip trailing blanks, 1=strip */
long nullformat; /* 0=NULL as "", 1= NULL as "NULL" */
} ifx_module;
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net