lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes in reading data into bound fields

Browse Source
This commit is contained in:
whydoubt
2005-11-04 12:12:11 +00:00
parent 5aafee6641
commit de1ce907a4
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
Fri Nov 4 06:10:41 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/data.c: Fix in reading bound boolean fields (Yasir Assam)
* src/libmdb/data.c: Several more fixes in reading data into bound fields
Mon Oct 17 06:25:44 CDT 2005 Jeff Smith <whydoubt@yahoo.com> Mon Oct 17 06:25:44 CDT 2005 Jeff Smith <whydoubt@yahoo.com>
* src/util/mdb-prop.c: General cleanup * src/util/mdb-prop.c: General cleanup
* HACKING: Correct info about MDBICONV * HACKING: Correct info about MDBICONV

34
src/libmdb/data.c
View File

@@ -33,7 +33,7 @@ static int _mdb_attempt_bind(MdbHandle *mdb,
static char *mdb_num_to_string(MdbHandle *mdb, int start, int datatype, int prec, int scale); static char *mdb_num_to_string(MdbHandle *mdb, int start, int datatype, int prec, int scale);
static char *mdb_date_to_string(MdbHandle *mdb, int start); static char *mdb_date_to_string(MdbHandle *mdb, int start);
#ifdef MDB_COPY_OLE #ifdef MDB_COPY_OLE
static size_t mdb_copy_ole(MdbHandle *mdb, char *dest, int start, int size); static size_t mdb_copy_ole(MdbHandle *mdb, void *dest, int start, int size);
#endif #endif
static char date_fmt[64] = "%x %X"; static char date_fmt[64] = "%x %X";
@@ -163,20 +163,23 @@ int bit_num = (col_num - 1) % 8;
} }
/* bool has to be handled specially because it uses the null bit to store its /* bool has to be handled specially because it uses the null bit to store its
** value*/ ** value*/
static int static size_t
mdb_xfer_bound_bool(MdbHandle *mdb, MdbColumn *col, int value) mdb_xfer_bound_bool(MdbHandle *mdb, MdbColumn *col, int value)
{ {
col->cur_value_len = value; col->cur_value_len = value;
if (col->bind_ptr) { if (col->bind_ptr) {
strcpy(col->bind_ptr, value ? "0" : "1"); strcpy(col->bind_ptr, value ? "0" : "1");
} }
if (col->len_ptr) {
return 0; *col->len_ptr = 1;
} }
static int mdb_xfer_bound_ole(MdbHandle *mdb, int start, MdbColumn *col, int len)
return 1;
}
static size_t
mdb_xfer_bound_ole(MdbHandle *mdb, int start, MdbColumn *col, int len)
{ {
int ret = 0; size_t ret = 0;
if (len) { if (len) {
col->cur_value_start = start; col->cur_value_start = start;
col->cur_value_len = len; col->cur_value_len = len;
@@ -184,18 +187,23 @@ static int mdb_xfer_bound_ole(MdbHandle *mdb, int start, MdbColumn *col, int len
col->cur_value_start = 0; col->cur_value_start = 0;
col->cur_value_len = 0; col->cur_value_len = 0;
} }
if (col->bind_ptr || col->len_ptr) {
#ifdef MDB_COPY_OLE #ifdef MDB_COPY_OLE
if (col->bind_ptr || col->len_ptr) {
ret = mdb_copy_ole(mdb, col->bind_ptr, start, len); ret = mdb_copy_ole(mdb, col->bind_ptr, start, len);
#endif
memcpy(col->bind_ptr, &mdb->pg_buf[start], MDB_MEMO_OVERHEAD);
} }
#else
if (col->bind_ptr) {
memcpy(col->bind_ptr, mdb->pg_buf + start, MDB_MEMO_OVERHEAD);
}
ret = MDB_MEMO_OVERHEAD;
#endif
if (col->len_ptr) { if (col->len_ptr) {
*col->len_ptr = MDB_MEMO_OVERHEAD; *col->len_ptr = ret;
} }
return ret; return ret;
} }
static int mdb_xfer_bound_data(MdbHandle *mdb, int start, MdbColumn *col, int len) static size_t
mdb_xfer_bound_data(MdbHandle *mdb, int start, MdbColumn *col, int len)
{ {
int ret; int ret;
//if (!strcmp("Name",col->name)) { //if (!strcmp("Name",col->name)) {
@@ -532,7 +540,7 @@ mdb_ole_read(MdbHandle *mdb, MdbColumn *col, void *ole_ptr, int chunk_size)
} }
} }
#ifdef MDB_COPY_OLE #ifdef MDB_COPY_OLE
static size_t mdb_copy_ole(MdbHandle *mdb, char *dest, int start, int size) static size_t mdb_copy_ole(MdbHandle *mdb, void *dest, int start, int size)
{ {
guint32 ole_len; guint32 ole_len;
gint32 row_start, pg_row; gint32 row_start, pg_row;