CVS update: php3/functions
| From: | danny | Date: | Sun, 20 Sep 1998 11:39:05 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1298@lists.php.net to get a copy of this message | ||
Date: Sunday September 20, 1998 @ 7:39
Author: danny
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv14210/functions
Modified Files:
ifx.ec readme.ifx
Log Message:
- completed changes by jah
- cosmetics (indentation)
- readme.ifx reflects changes made by jah
Index: php3/functions/ifx.ec
diff -c php3/functions/ifx.ec:1.25 php3/functions/ifx.ec:1.26
*** php3/functions/ifx.ec:1.25 Sat Sep 19 21:20:25 1998
--- php3/functions/ifx.ec Sun Sep 20 07:39:04 1998
***************
*** 437,451 ****
#endif
ifx_module_entry.type = type;
! REGISTER_LONG_CONSTANT("IFX_SCROLL", IFX_SCROLL, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_HOLD", IFX_HOLD, CONST_CS | CONST_PERSISTENT);
$ifdef HAVE_IFX_IUS;
! REGISTER_LONG_CONSTANT("IFX_LO_RDONLY", LO_RDONLY, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_WRONLY", LO_WRONLY, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_APPEND", LO_APPEND, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_RDWR", LO_RDWR, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_BUFFER", LO_BUFFER, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_NOBUFFER", LO_NOBUFFER, CONST_CS | CONST_PERSISTENT);
$endif;
return SUCCESS;
--- 437,451 ----
#endif
ifx_module_entry.type = type;
! REGISTER_LONG_CONSTANT("IFX_SCROLL", IFX_SCROLL, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_HOLD", IFX_HOLD, CONST_CS | CONST_PERSISTENT);
$ifdef HAVE_IFX_IUS;
! REGISTER_LONG_CONSTANT("IFX_LO_RDONLY", LO_RDONLY, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_WRONLY", LO_WRONLY, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_APPEND", LO_APPEND, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_RDWR", LO_RDWR, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_BUFFER", LO_BUFFER, CONST_CS | CONST_PERSISTENT);
! REGISTER_LONG_CONSTANT("IFX_LO_NOBUFFER", LO_NOBUFFER, CONST_CS | CONST_PERSISTENT);
$endif;
return SUCCESS;
***************
*** 911,917 ****
char *blobfilename;
int locind;
int ctype;
! int affected_rows;
Informix_TLS_VARS;
--- 911,917 ----
char *blobfilename;
int locind;
int ctype;
! int affected_rows;
Informix_TLS_VARS;
***************
*** 1115,1122 ****
Ifx_Result->numcols = fieldcount;
Ifx_Result->isscroll = Ifx_Result->ishold = 0;
! if (ctype & IFX_SCROLL)
! Ifx_Result->isscroll = 1;
if (ctype & IFX_HOLD)
Ifx_Result->ishold = 1;
--- 1115,1122 ----
Ifx_Result->numcols = fieldcount;
Ifx_Result->isscroll = Ifx_Result->ishold = 0;
! if (ctype & IFX_SCROLL)
! Ifx_Result->isscroll = 1;
if (ctype & IFX_HOLD)
Ifx_Result->ishold = 1;
***************
*** 1427,1434 ****
Ifx_Result->numcols = fieldcount;
Ifx_Result->isscroll = Ifx_Result->ishold = 0;
! if (ctype & IFX_SCROLL)
! Ifx_Result->isscroll = 1;
if (ctype & IFX_HOLD)
Ifx_Result->ishold = 1;
--- 1427,1434 ----
Ifx_Result->numcols = fieldcount;
Ifx_Result->isscroll = Ifx_Result->ishold = 0;
! if (ctype & IFX_SCROLL)
! Ifx_Result->isscroll = 1;
if (ctype & IFX_HOLD)
Ifx_Result->ishold = 1;
***************
*** 2019,2028 ****
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;
--- 2019,2028 ----
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;
***************
*** 2322,2337 ****
php3_printf("<td>%s</td>", string_data);
break;
$ifdef HAVE_IFX_IUS;
! case SQLSERIAL8 :
case SQLINT8 :
! EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :int8_var = DATA;
! ifx_int8toasc(&int8_var,string_data,200);
! php3_printf("<td>%s</td>", string_data);
! break;
! case SQLNCHAR :
! case SQLNVCHAR :
case SQLLVARCHAR:
! case SQLBOOL:
$endif;
case SQLCHAR :
case SQLVCHAR :
--- 2322,2335 ----
php3_printf("<td>%s</td>", string_data);
break;
$ifdef HAVE_IFX_IUS;
! case SQLSERIAL8:
case SQLINT8 :
! EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :int8_var = DATA;
! ifx_int8toasc(&int8_var,string_data,200);
! php3_printf("<td>%s</td>", string_data);
! break;
case SQLLVARCHAR:
! case SQLBOOL :
$endif;
case SQLCHAR :
case SQLVCHAR :
***************
*** 2342,2351 ****
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;
--- 2340,2349 ----
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;
***************
*** 2581,2586 ****
--- 2579,2590 ----
case SQLVCHAR :
char_data = "SQLVCHAR";
break;
+ case SQLNCHAR :
+ char_data = "SQLNCHAR";
+ break;
+ case SQLNVCHAR :
+ char_data = "SQLNVCHAR";
+ break;
case SQLTEXT :
char_data = "SQLTEXT";
break;
***************
*** 2593,2604 ****
break;
case SQLBOOL :
char_data = "SQLBOOL";
- break;
- case SQLNCHAR :
- char_data = "SQLNCHAR";
- break;
- case SQLNVCHAR :
- char_data = "SQLNVCHAR";
break;
case SQLINT8 :
char_data = "SQLINT8";
--- 2597,2602 ----
Index: php3/functions/readme.ifx
diff -c php3/functions/readme.ifx:1.2 php3/functions/readme.ifx:1.3
*** php3/functions/readme.ifx:1.2 Sat Sep 19 10:09:41 1998
--- php3/functions/readme.ifx Sun Sep 20 07:39:05 1998
***************
*** 85,91 ****
--- 85,98 ----
files accidentally left behind (their names all start with "blb").
+ Automatically trimming "char" (SQLCHAR and SQLNCHAR) data
+ ---------------------------------------------------------
+ This can be set with a configuration variable :
+
+ ifx.charasvarchar : if set to 1 trailing spaces will be automatically trimmed
+
+
Function reference.
-------------------
***************
*** 113,120 ****
If using persistent connections you should not use "ifx_close" unless
you really mean to.
Example :
! $conn_id = ifx_pconnect(mydb@ol_srv1,"imyself", "mypassword");
----------------------------------------------------------------------
Function:
--- 120,131 ----
If using persistent connections you should not use "ifx_close" unless
you really mean to.
+ You can omit the $database/$user/$password parameters if the configuration
+ variables "ifx.default_host", "ifx.default_user" and
"ifx.default_password"
+ are set in your php3.ini.
+
Example :
! $conn_id = ifx_pconnect(mydb@ol_srv1,"imyself", "4alltosee");
----------------------------------------------------------------------
Function:
--
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