CVS update: php3/functions
| From: | shane | Date: | Mon, 02 Nov 1998 17:14:00 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2134@lists.php.net to get a copy of this message | ||
Date: Monday November 2, 1998 @ 12:14
Author: shane
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv24145/functions
Modified Files:
php3_unified_odbc.h unified_odbc.c
Log Message:
db2 project file and uodbc updates
Index: php3/functions/php3_unified_odbc.h
diff -c php3/functions/php3_unified_odbc.h:1.37 php3/functions/php3_unified_odbc.h:1.38
*** php3/functions/php3_unified_odbc.h:1.37 Mon Nov 2 11:11:37 1998
--- php3/functions/php3_unified_odbc.h Mon Nov 2 12:13:58 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: php3_unified_odbc.h,v 1.37 1998/11/02 16:11:37 shane Exp $ */
#ifndef _UNIFIED_ODBC_H
#define _UNIFIED_ODBC_H
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: php3_unified_odbc.h,v 1.38 1998/11/02 17:13:58 shane Exp $ */
#ifndef _UNIFIED_ODBC_H
#define _UNIFIED_ODBC_H
***************
*** 41,47 ****
* link with db2cli.lib
*/
! #if HAVE_UODBC || HAVE_DB2
/* ODBC_UNIQUE_NAMES should be defined in config.h if you are
* compiling more than one of any of the uodbc databases
--- 41,47 ----
* link with db2cli.lib
*/
! #if HAVE_UODBC
/* ODBC_UNIQUE_NAMES should be defined in config.h if you are
* compiling more than one of any of the uodbc databases
Index: php3/functions/unified_odbc.c
diff -c php3/functions/unified_odbc.c:1.86 php3/functions/unified_odbc.c:1.87
*** php3/functions/unified_odbc.c:1.86 Mon Nov 2 11:11:37 1998
--- php3/functions/unified_odbc.c Mon Nov 2 12:13:59 1998
***************
*** 48,62 ****
#include "php.h"
#include "internal_functions.h"
#if PHP_31
# include "ext/standard/php3_string.h"
#else
# include "php3_string.h"
#endif
#include "php3_unified_odbc.h"
#include "head.h"
#include "snprintf.h"
! #if HAVE_UODBC || HAVE_DB2
#ifdef THREAD_SAFE
--- 48,64 ----
#include "php.h"
#include "internal_functions.h"
#if PHP_31
+ # include "ext/phpdl.h"
# include "ext/standard/php3_string.h"
#else
+ # include "dl/phpdl.h"
# include "php3_string.h"
#endif
#include "php3_unified_odbc.h"
#include "head.h"
#include "snprintf.h"
! #if HAVE_UODBC
#ifdef THREAD_SAFE
***************
*** 162,168 ****
#if COMPILE_DL
- #include "ext/phpdl.h"
DLEXPORT php3_module_entry *get_module() { return &UODBC_MODULE_ENTRY; };
#endif
--- 164,169 ----
***************
*** 387,405 ****
UODBC_TLS_VARS;
#if HAVE_SOLID
! PUTS("Unified ODBC Support active (compiled with Solid)");
#elif HAVE_ADABAS
! PUTS("Unified ODBC Support active (compiled with Adabas D)");
#elif HAVE_IODBC && !(WIN32|WINNT)
! PUTS("Unified ODBC Support active (compiled with iODBC)");
! #elif WIN32|WINNT
! PUTS("Unified ODBC Support active (compiled with win32 ODBC)");
#elif HAVE_VELOCIS
! PUTS("Unified ODBC Support active (compiled with Velocis)");
#else
! PUTS("Unified ODBC Support active (compiled with unknown library)");
#endif
! PUTS("<BR>");
#if DEBUG
php3_printf("default_db: %s<br>\n",UODBC_GLOBAL(PHP3_UODBC_MODULE).defDB);
php3_printf("default_user: %s<br>\n",UODBC_GLOBAL(PHP3_UODBC_MODULE).defUser);
--- 388,408 ----
UODBC_TLS_VARS;
#if HAVE_SOLID
! php3_printf("Unified ODBC Support active (compiled with Solid)");
#elif HAVE_ADABAS
! php3_printf("Unified ODBC Support active (compiled with Adabas D)");
#elif HAVE_IODBC && !(WIN32|WINNT)
! php3_printf("Unified ODBC Support active (compiled with iODBC)");
#elif HAVE_VELOCIS
! php3_printf("Unified ODBC Support active (compiled with Velocis)");
! #elif HAVE_DB2
! php3_printf("Unified ODBC Support active (compiled with IBM DB2)");
! #elif WIN32|WINNT
! php3_printf("Unified ODBC Support active (compiled with win32 ODBC)");
#else
! php3_printf("Unified ODBC Support active (compiled with unknown library)");
#endif
! php3_printf("<BR>");
#if DEBUG
php3_printf("default_db: %s<br>\n",UODBC_GLOBAL(PHP3_UODBC_MODULE).defDB);
php3_printf("default_user: %s<br>\n",UODBC_GLOBAL(PHP3_UODBC_MODULE).defUser);
***************
*** 1457,1463 ****
RETURN_FALSE;
}
/* chop the trailing \0 by outputing only 4095 bytes */
! PHPWRITE(field,(rc == SQL_SUCCESS_WITH_INFO) ? 4095 :
result->values[field_ind].vallen);
if (rc == SQL_SUCCESS) { /* no more data avail */
--- 1460,1466 ----
RETURN_FALSE;
}
/* chop the trailing \0 by outputing only 4095 bytes */
! php3_printf(field,(rc == SQL_SUCCESS_WITH_INFO) ? 4095 :
result->values[field_ind].vallen);
if (rc == SQL_SUCCESS) { /* no more data avail */
***************
*** 1566,1577 ****
RETURN_FALSE;
}
if (rc == SQL_SUCCESS_WITH_INFO)
! PHPWRITE(buf,result->longreadlen);
else if (result->values[i].vallen == SQL_NULL_DATA){
php3_printf(" </td>");
break;
}
! PHPWRITE(buf, result->values[i].vallen);
php3_printf("</td>");
break;
--- 1569,1580 ----
RETURN_FALSE;
}
if (rc == SQL_SUCCESS_WITH_INFO)
! php3_printf(buf,result->longreadlen);
else if (result->values[i].vallen == SQL_NULL_DATA){
php3_printf(" </td>");
break;
}
! php3_printf(buf, result->values[i].vallen);
php3_printf("</td>");
break;
--
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