[svn:dbd-oracle] r15431 - dbd-oracle/branches/FAN

Author: byterock
Date: Fri Oct  5 10:56:07 2012
New Revision: 15431

Modified:
   dbd-oracle/branches/FAN/dbdimp.c

Log:
well working just clean up now

Modified: dbd-oracle/branches/FAN/dbdimp.c
==============================================================================
--- dbd-oracle/branches/FAN/dbdimp.c	(original)
+++ dbd-oracle/branches/FAN/dbdimp.c	Fri Oct  5 10:56:07 2012
@@ -442,8 +442,10 @@
 
     /* HA Events */
 
+
 	if ((svp=DBD_ATTRIB_GET_SVP(attr, "ora_ha_function",  15)) && SvOK(*svp)){
 
+
         if ((SvROK(*svp) && (SvTYPE(SvRV(*svp)) == SVt_PVCV)) ||
             (SvPOK(*svp))) {
             imp_dbh->ha_function = newSVsv(*svp);
@@ -451,10 +453,13 @@
             croak("ora_ha_function needs to be a string or code reference");
         }
 
+
         (void)hv_delete((HV*)SvRV(attr), "ora_ha_function", 15, G_DISCARD);
 
 	}
 
+PerlIO_printf(DBILOGFP," check 1 \n ");
+
 
 
 #endif /*ORA_OCI_112*/
@@ -496,10 +501,15 @@
 
     }
 
+PerlIO_printf(DBILOGFP," check 2 \n ");
+
+
     /* TAF Events */
 
 	imp_dbh->using_taf = 0;
 
+PerlIO_printf(DBILOGFP," check 2a \n ");
+
 	if (DBD_ATTRIB_TRUE(attr,"ora_taf",7,svp)){
 		imp_dbh->using_taf = 1;
 		imp_dbh->taf_sleep = 5; /* 5 second default */
@@ -517,12 +527,15 @@
 
     imp_dbh->server_version = 0;
 
+PerlIO_printf(DBILOGFP," check 2b \n ");
+
 	/* check to see if DBD_verbose or ora_verbose is set*/
 	if (DBD_ATTRIB_TRUE(attr,"dbd_verbose",11,svp))
 		DBD_ATTRIB_GET_IV(  attr, "dbd_verbose",  11, svp, dbd_verbose);
 	if (DBD_ATTRIB_TRUE(attr,"ora_verbose",11,svp))
 		DBD_ATTRIB_GET_IV(  attr, "ora_verbose",  11, svp, dbd_verbose);
 
+PerlIO_printf(DBILOGFP," check 2c \n ");
 	/* check to see if success_warn is set. This will */
 	/* warn after some sucessfull operations for tuning results */
 	if (DBD_ATTRIB_TRUE(attr,"ora_oci_success_warn",20,svp))
@@ -534,9 +547,13 @@
 	if (DBD_ATTRIB_TRUE(attr,"ora_objects",11,svp))
 		DBD_ATTRIB_GET_IV(  attr, "ora_objects",11, svp, ora_objects);
 
+PerlIO_printf(DBILOGFP," check 2d \n ");
+
 	if (DBIS->debug >= 6 || dbd_verbose >= 6 )
 		dump_env_to_trace();
 
+PerlIO_printf(DBILOGFP," check 2e \n ");
+
 	/* dbi_imp_data code adapted from DBD::mysql */
 	if (DBIc_has(imp_dbh, DBIcf_IMPSET)) {
 		/* dbi_imp_data from take_imp_data */
@@ -556,6 +573,9 @@
 
 	imp_dbh->envhp = imp_drh->envhp;	/* will be NULL on first connect */
 
+PerlIO_printf(DBILOGFP," check 3 \n ");
+
+
 #if defined(USE_ITHREADS) && defined(PERL_MAGIC_shared_scalar)
 	shared_dbh_priv_svp = (DBD_ATTRIB_OK(attr)?hv_fetch((HV*)SvRV(attr), "ora_dbh_share", 13, 0):NULL) ;
 	shared_dbh_priv_sv = shared_dbh_priv_svp?*shared_dbh_priv_svp:NULL ;
@@ -936,6 +956,8 @@
 #ifdef ORA_OCI_112
 	/* set up HA evnets callback if requested */
 
+ PerlIO_printf(DBILOGFP," check 4 \n ");
+
 	if (imp_dbh->ha_function){
        if (enable_ha(dbh,imp_dbh) == 0) return 0;
 	}
@@ -4362,8 +4384,9 @@
 }
 
 static void
-dump_env_to_trace(imp_dbh_t *imp_dbh) {
+dump_env_to_trace() {
 	dTHX;
+	PerlIO *fp = DBILOGFP;
 	int i = 0;
 	char *p;
 
@@ -4375,10 +4398,10 @@
 #endif
 
 
-	PerlIO_printf(DBIc_LOGPIO(imp_dbh), "Environment variables:\n");
+	PerlIO_printf(fp, "Environment variables:\n");
 	do {
-        p = (char*)environ[i++];
-        PerlIO_printf(DBIc_LOGPIO(imp_dbh),"\t%s\n",p);
+	p = (char*)environ[i++];
+	PerlIO_printf(fp,"\t%s\n",p);
 	} while ((char*)environ[i] != '\0');
 }