Author: byterock
Date: Fri Oct 17 03:38:50 2008
New Revision: 11985
Modified:
dbd-oracle/branches/utf8_ea_2/dbdimp.c
dbd-oracle/branches/utf8_ea_2/oci8.c
Log:
newest changset
Modified: dbd-oracle/branches/utf8_ea_2/dbdimp.c
==============================================================================
--- dbd-oracle/branches/utf8_ea_2/dbdimp.c (original)
+++ dbd-oracle/branches/utf8_ea_2/dbdimp.c Fri Oct 17 03:38:50 2008
@@ -3172,8 +3172,6 @@
* mixed utf8 and native (non-utf8) data, then it's a fatal problem
* utf8 _compatible_ means, can be upgraded to utf8, ie. utf8 or
ascii */
if ((utf8 & ARRAY_BIND_NATIVE) && CS_IS_NOT_UTF8(csid)) {
- warn("what is my one=%d",av_len(tuples_utf8_av));
- if (av_len(tuples_utf8_av+1)){
oratext charsetname[OCI_NLS_MAXBUFSZ];
OCINlsCharSetIdToName(imp_sth->envhp,charsetname, sizeof(charsetname),csid );
@@ -3181,17 +3179,14 @@
SV *err_svs[2];
SV *item;
item=*(av_fetch(tuples_utf8_av,i,0));
- warn("what is my one=%d
=%d\n",av_len(tuples_utf8_av),SvIV(item));
err_svs[0] = newSViv((IV)0);
err_svs[1] = newSVpvf("DBD Oracle Warning: You
have mixed utf8 and non-utf8 in an array bind in parameter#%d. This may result
in corrupt data. The Query charset id=%d,
name=%s",parma_index+1,csid,charsetname);
- av_store(tuples_status_av,SvIV(item),
- newRV_noinc((SV *)(av_make(2, err_svs))));
- warn("what is my one=%d\n",av_len(tuples_utf8_av));
- }
+
av_store(tuples_status_av,SvIV(item),newRV_noinc((SV *)(av_make(2, err_svs))));
+ }
/*av_store(tuples_status_av,tuple_index,
newRV_noinc((SV *)(av_make(2, err_svs))));
*/
- }
+
}
csid = utf8_csid; /* not al32utf8_csid here on purpose */
@@ -3404,14 +3399,13 @@
utf8_flgs[i] |= ARRAY_BIND_UTF8;
if (SvTRUE(tuples_status)){
av_push(tuples_utf8_av,newSViv(j));
-
}
}
else {
utf8_flgs[i] |= ARRAY_BIND_NATIVE;
- warn("I may be i=%d,j=%d",i,j);
+
}
/* Do OCI bind calls on last iteration. */
if( ((unsigned int) j ) == exe_count - 1 ) {
@@ -3419,6 +3413,7 @@
if(!do_bind_array_exec(sth, imp_sth, phs[i],
utf8_flgs[i],i,tuples_utf8_av,tuples_status_av)) {
Safefree(phs);
Safefree(utf8_flgs);
+ /*Safefree(tuples_utf8_av);*/
}
}
}
Modified: dbd-oracle/branches/utf8_ea_2/oci8.c
==============================================================================
--- dbd-oracle/branches/utf8_ea_2/oci8.c (original)
+++ dbd-oracle/branches/utf8_ea_2/oci8.c Fri Oct 17 03:38:50 2008
@@ -695,7 +695,7 @@
*alenp = phs->alen;
*indpp = &phs->indp;
*piecep = OCI_ONE_PIECE;
- if (DBIS->debug >= 3 || dbd_verbose <=3)
+ if (DBIS->debug >= 3 || dbd_verbose >=3)
PerlIO_printf(DBILOGFP, " in '%s' [%lu,%lu]: len %2lu,
ind %d%s, value=%s\n",
phs->name, ul_t(iter), ul_t(index), ul_t(phs->alen),
phs->indp,
(phs->desc_h) ? " via descriptor" :
"",neatsvpv(phs->sv,10));
