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

Author: byterock
Date: Fri Oct 28 18:38:13 2011
New Revision: 14981

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

Log:
workring ok now ready m things for merge to trunk

Modified: dbd-oracle/branches/FAN/oci8.c
==============================================================================
--- dbd-oracle/branches/FAN/oci8.c	(original)
+++ dbd-oracle/branches/FAN/oci8.c	Fri Oct 28 18:38:13 2011
@@ -1314,19 +1314,18 @@
    ub4 event_att_len;
    ub4 event_code;
    HV* ha_event;
-
+   AV* servers;
    PERL_SET_CONTEXT(ctx->ct_perl);
    ha_event  = newHV();
+   servers  = newAV();
    PUSHMARK(SP);
 
-   PerlIO_printf(DBILOGFP, " how about this my functio %s\n",ctx->function);
    OCIAttrGet_log_stat(eventhp,  OCI_HTYPE_EVENT, (dvoid *)&event_code, 0, OCI_ATTR_HA_SOURCE, imp_dbh->errhp, status);
 
    hv_store(ha_event,"Source",6,sv_2mortal(newSVpv(oci_ha_event_source(event_code),strlen(oci_ha_event_source(event_code)))),0);
 
    OCIAttrGet_log_stat(eventhp,  OCI_HTYPE_EVENT, (dvoid *)&event_code, 0, OCI_ATTR_HA_STATUS, imp_dbh->errhp, status);
 
-  PerlIO_printf(DBILOGFP, " how about OCI_ATTR_HA_STATUS=%d HA next dwon=%d,up-%d  \n",event_code,OCI_HA_STATUS_DOWN,OCI_HA_STATUS_UP);
 
 
    if (event_code == OCI_HA_STATUS_UP){
@@ -1363,7 +1362,6 @@
 
    OCIAttrGet_log_stat(eventhp,  OCI_HTYPE_EVENT, (dvoid *)&event_ts,0, OCI_ATTR_HA_TIMESTAMP, imp_dbh->errhp, status);
 
- //  OCIDateTimeToText_log_stat(imp_dbh->envhp,imp_dbh->errhp,event_ts,&event_att_len,tsbuff,status);
 
    OCIDateTimeToText(imp_dbh->envhp,imp_dbh->errhp, event_ts, (char*) "MM-DD-YY HH24:MI:SS",
  		    strlen("MM-DD-YY HH24:MI:SS"),
@@ -1372,34 +1370,26 @@
    hv_store(ha_event,"Timestamp",9,sv_2mortal(newSVpv((char*)tsbuff,event_att_len)),0);
 
 
- dbd_verbose=0;
-
-
 
    OCIAttrGet_log_stat(eventhp,  OCI_HTYPE_EVENT, (dvoid *)&srvhp,0, OCI_ATTR_HA_SRVFIRST, imp_dbh->errhp, status);
 
 
 
+   OCIAttrGet_log_stat(srvhp,  OCI_HTYPE_SERVER, (dvoid *)&event_att,&event_att_len, OCI_ATTR_INSTNAME, imp_dbh->errhp, status);
 
-  OCIAttrGet_log_stat(srvhp,  OCI_HTYPE_SERVER, (dvoid *)&event_att,&event_att_len, OCI_ATTR_INSTNAME, imp_dbh->errhp, status);
 
+   av_push(servers, newSVpv( (char *) event_att,0));
 
-  av_push(servers, newSVpv( (char *) event_att,0));
-
-
-  PerlIO_printf(DBILOGFP, " hacb 9 server instance from new srvph name=%s \n",event_att);
 
 
 
   while(status){
-PerlIO_printf(DBILOGFP, " hacb 9.1 while loop\n");
 
      OCIAttrGet_log_stat(eventhp,  OCI_HTYPE_EVENT, (dvoid *)&srvhp,0, OCI_ATTR_HA_SRVNEXT, imp_dbh->errhp, status);
      if (status == OCI_NO_DATA) {
           break;
      }
      else {
-      PerlIO_printf(DBILOGFP, " hacb 10 found another server handle.\n");
 
       OCIAttrGet_log_stat(srvhp,  OCI_HTYPE_SERVER, (dvoid *)&event_att,&event_att_len, OCI_ATTR_INSTNAME, imp_dbh->errhp, status);
       av_push(servers, newSVpv( (char *) event_att,0));
@@ -1407,11 +1397,10 @@
     }
   }
 
-  hv_store(ha_event,"Instances",9,newRV_noinc((SV*)servers),0);
-
+   hv_store(ha_event,"Instances",9,newRV_noinc((SV*)servers),0);
    XPUSHs(sv_2mortal(newRV((SV*)ha_event)));
    PUTBACK;
-  call_pv(ctx->function, G_DISCARD);
+   call_pv(ctx->function, G_DISCARD);
 }