CVS update: php3/functions
| From: | nyenyon | Date: | Wed, 16 Sep 1998 19:14:11 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1174@lists.php.net to get a copy of this message | ||
Date: Wednesday September 16, 1998 @ 15:14
Author: nyenyon
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv20233
Modified Files:
ifx.ec
Log Message:
- some minor adaptions to the IUS-ESQL/C
Index: php3/functions/ifx.ec
diff -c php3/functions/ifx.ec:1.19 php3/functions/ifx.ec:1.20
*** php3/functions/ifx.ec:1.19 Wed Sep 16 13:36:18 1998
--- php3/functions/ifx.ec Wed Sep 16 15:14:10 1998
***************
*** 120,125 ****
--- 120,130 ----
#if HAVE_IFX
+ #ifdef HAVE_IFX_IUS
+ EXEC SQL DEFINE HAVE_IFX_IUS 1;
+ #endif
+
+
EXEC SQL include locator;
EXEC SQL include sqltypes;
***************
*** 160,166 ****
{"ifx_nullformat" ,php3_ifx_nullformat, NULL},
{"ifx_blobinfile_mode",php3_ifx_blobinfile_mode, NULL},
! #if HAVE_IFX_IUS
{"ifxus_create_slob", php3_ifxus_create_slob, NULL},
{"ifxus_close_slob", php3_ifxus_close_slob, NULL},
{"ifxus_open_slob", php3_ifxus_open_slob, NULL},
--- 165,171 ----
{"ifx_nullformat" ,php3_ifx_nullformat, NULL},
{"ifx_blobinfile_mode",php3_ifx_blobinfile_mode, NULL},
! $ifdef HAVE_IFX_IUS;
{"ifxus_create_slob", php3_ifxus_create_slob, NULL},
{"ifxus_close_slob", php3_ifxus_close_slob, NULL},
{"ifxus_open_slob", php3_ifxus_open_slob, NULL},
***************
*** 170,176 ****
{"ifxus_seek_slob", php3_ifxus_seek_slob, NULL},
{"ifxus_tell_slob", php3_ifxus_tell_slob, NULL},
! #endif
{NULL, NULL, NULL}
};
--- 175,181 ----
{"ifxus_seek_slob", php3_ifxus_seek_slob, NULL},
{"ifxus_tell_slob", php3_ifxus_tell_slob, NULL},
! $endif;
{NULL, NULL, NULL}
};
***************
*** 976,985 ****
strcpy(Ifx_Result->descrpid, descrpid);
for (i = 0; i < MAXBLOBS; ++i)
Ifx_Result->blob_id[i] = -1;
! #if HAVE_IFX_IUS
for (i = 0; i < MAXSLOBS; ++i)
Ifx_Result->slob_id[i] = -1;
! #endif
Ifx_Result->iscursory = -1; /* prevent ifx_do */
Ifx_Result->paramquery=0;
--- 981,990 ----
strcpy(Ifx_Result->descrpid, descrpid);
for (i = 0; i < MAXBLOBS; ++i)
Ifx_Result->blob_id[i] = -1;
! $ifdef HAVE_IFX_IUS;
for (i = 0; i < MAXSLOBS; ++i)
Ifx_Result->slob_id[i] = -1;
! $endif;
Ifx_Result->iscursory = -1; /* prevent ifx_do */
Ifx_Result->paramquery=0;
***************
*** 1327,1336 ****
strcpy(Ifx_Result->statemid, statemid);
for (i = 0; i < MAXBLOBS; ++i)
Ifx_Result->blob_id[i] = -1;
! #if HAVE_IFX_IUS
for (i = 0; i < MAXSLOBS; ++i)
Ifx_Result->slob_id[i] = -1;
! #endif
Ifx_Result->iscursory = -1; /* prevent ifx_do */
Ifx_Result->paramquery=0;
--- 1332,1341 ----
strcpy(Ifx_Result->statemid, statemid);
for (i = 0; i < MAXBLOBS; ++i)
Ifx_Result->blob_id[i] = -1;
! $ifdef HAVE_IFX_IUS;
for (i = 0; i < MAXSLOBS; ++i)
Ifx_Result->slob_id[i] = -1;
! $endif;
Ifx_Result->iscursory = -1; /* prevent ifx_do */
Ifx_Result->paramquery=0;
***************
*** 2025,2044 ****
add_assoc_string(return_value, fieldname, string_data, DUP);
break;
! #if HAVE_IFX_IUS
case SQLSERIAL8 :
case SQLINT8 :
- $ifdef HAVE_IFX_IUS;
EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :int8_var = DATA;
ifx_int8toasc(&int8_var,string_data,200);
add_assoc_string(return_value, fieldname, string_data, DUP);
break;
- $endif;
case SQLNCHAR :
case SQLNVCHAR :
case SQLLVARCHAR:
case SQLBOOL:
! #endif
case SQLCHAR :
case SQLVCHAR :
if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
--- 2030,2047 ----
add_assoc_string(return_value, fieldname, string_data, DUP);
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);
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) {
***************
*** 2344,2363 ****
intoasc(&intvl_data, string_data);
php3_printf("<td>%s</td>", string_data);
break;
! #if HAVE_IFX_IUS
case SQLSERIAL8 :
case SQLINT8 :
- $ifdef HAVE_IFX_IUS;
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;
- $endif;
case SQLNCHAR :
case SQLNVCHAR :
case SQLLVARCHAR:
case SQLBOOL:
! #endif
case SQLCHAR :
case SQLVCHAR :
if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
--- 2347,2364 ----
intoasc(&intvl_data, string_data);
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 :
if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
***************
*** 2606,2614 ****
case SQLBYTES :
char_data = "SQLBYTES";
break;
! #if HAVE_IFX_IUS
case SQLUDTFIXED :
! char_data = "SQLCLOB";
break;
case SQLBOOL :
char_data = "SQLBOOL";
--- 2607,2615 ----
case SQLBYTES :
char_data = "SQLBYTES";
break;
! $ifdef HAVE_IFX_IUS;
case SQLUDTFIXED :
! char_data = "SQLUDTFIXED";
break;
case SQLBOOL :
char_data = "SQLBOOL";
***************
*** 2628,2634 ****
case SQLLVARCHAR :
char_data = "SQLLVARCHAR";
break;
! #endif
default :
char_data=emalloc(20);
sprintf(char_data,"ESQL/C : %i",fieldtype);
--- 2629,2635 ----
case SQLLVARCHAR :
char_data = "SQLLVARCHAR";
break;
! $endif;
default :
char_data=emalloc(20);
sprintf(char_data,"ESQL/C : %i",fieldtype);
***************
*** 2811,2819 ****
case SQLBYTES :
char_data = "SQLBYTES";
break;
! #if HAVE_IFX_IUS
case SQLUDTFIXED :
! char_data = "SQLCLOB";
break;
case SQLBOOL :
char_data = "SQLBOOL";
--- 2812,2820 ----
case SQLBYTES :
char_data = "SQLBYTES";
break;
! $ifdef HAVE_IFX_IUS;
case SQLUDTFIXED :
! char_data = "SQLUDTFIXED";
break;
case SQLBOOL :
char_data = "SQLBOOL";
***************
*** 2833,2839 ****
case SQLLVARCHAR :
char_data = "SQLLVARCHAR";
break;
! #endif
default :
char_data=emalloc(20);
sprintf(char_data,"ESQL/C : %i",fieldtype);
--- 2834,2840 ----
case SQLLVARCHAR :
char_data = "SQLLVARCHAR";
break;
! $endif;
default :
char_data=emalloc(20);
sprintf(char_data,"ESQL/C : %i",fieldtype);
***************
*** 2970,2983 ****
Ifx_Result->blob_id[i]=-1;
}
}
! #if HAVE_IFX_IUS
for (i = 0; i < MAXSLOBS; ++i) {
if (Ifx_Result->slob_id[i]>0) {
php3_intifxus_free_slob(Ifx_Result->slob_id[i],list);
Ifx_Result->slob_id[i]=-1;
}
}
! #endif
cursorid = Ifx_Result->cursorid;
statemid = Ifx_Result->statemid;
--- 2971,2984 ----
Ifx_Result->blob_id[i]=-1;
}
}
! $ifdef HAVE_IFX_IUS;
for (i = 0; i < MAXSLOBS; ++i) {
if (Ifx_Result->slob_id[i]>0) {
php3_intifxus_free_slob(Ifx_Result->slob_id[i],list);
Ifx_Result->slob_id[i]=-1;
}
}
! $endif;
cursorid = Ifx_Result->cursorid;
statemid = Ifx_Result->statemid;
***************
*** 2996,3004 ****
RETURN_TRUE;
}
- #endif
-
-
/* ----------------------------------------------------------------------
** int php3_ifx_create_blob(int type, int mode, string param)
**
--- 2997,3002 ----
***************
*** 3637,3643 ****
! #if HAVE_IFX_IUS
--- 3635,3641 ----
! $ifdef HAVE_IFX_IUS;
***************
*** 4178,4187 ****
RETURN_LONG(nbytes);
}
#endif
-
/*
* Local variables:
--- 4176,4185 ----
RETURN_LONG(nbytes);
}
+ $endif;
#endif
/*
* Local variables:
--
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