From f893efb40136e0fc7f497ce951368bfcb7888ec5 Mon Sep 17 00:00:00 2001 From: Mark Ord Date: Sat, 26 May 2018 10:37:05 -0700 Subject: [PATCH 1/2] Unable to filter on memo field #140 * Added case statement for comparing memo fields --- src/libmdb/sargs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libmdb/sargs.c b/src/libmdb/sargs.c index 1325852..2cd4530 100644 --- a/src/libmdb/sargs.c +++ b/src/libmdb/sargs.c @@ -174,6 +174,8 @@ int mdb_test_sarg(MdbHandle *mdb, MdbColumn *col, MdbSargNode *node, MdbField *field) { char tmpbuf[256]; + char* val; + int ret; if (node->op == MDB_ISNULL) return field->is_null?1:0; @@ -195,6 +197,13 @@ mdb_test_sarg(MdbHandle *mdb, MdbColumn *col, MdbSargNode *node, MdbField *field case MDB_TEXT: mdb_unicode2ascii(mdb, field->value, field->siz, tmpbuf, 256); return mdb_test_string(node, tmpbuf); + case MDB_MEMO: + val = mdb_col_to_string(mdb, mdb->pg_buf, field->start, col->col_type, (gint32)mdb_get_int32(field->value, 0)); + //printf("%s\n",val); + ret = mdb_test_string(node, val); + g_free(val); + return ret; + break; case MDB_DATETIME: return mdb_test_date(node, mdb_get_double(field->value, 0)); default: From 68724b2cf2d656c0fc4e0cddea927213a7f0d904 Mon Sep 17 00:00:00 2001 From: Evan Miller Date: Mon, 3 Aug 2020 17:34:53 -0400 Subject: [PATCH 2/2] Fix JET4 warnings brianb/mdbtools#158 --- src/libmdb/props.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libmdb/props.c b/src/libmdb/props.c index 801fd5b..b2b542c 100644 --- a/src/libmdb/props.c +++ b/src/libmdb/props.c @@ -196,6 +196,7 @@ mdb_kkd_to_props(MdbHandle *mdb, void *buffer, size_t len) { break; case 0x00: case 0x01: + case 0x02: if (!names) { fprintf(stderr,"sequence error!\n"); break;