lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-07-17 00:53:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into no-glib

Browse Source
This commit is contained in:
Evan Miller 2020-08-03 18:59:01 -04:00
commit cb7b694d4b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libmdb/props.c
View File

@ -196,6 +196,7 @@ mdb_kkd_to_props(MdbHandle *mdb, void *buffer, size_t len) {
break; break;
case 0x00: case 0x00:
case 0x01: case 0x01:
case 0x02:
if (!names) { if (!names) {
fprintf(stderr,"sequence error!\n"); fprintf(stderr,"sequence error!\n");
break; break;

9
src/libmdb/sargs.c
View File

@ -212,6 +212,8 @@ int
mdb_test_sarg(MdbHandle *mdb, MdbColumn *col, MdbSargNode *node, MdbField *field) mdb_test_sarg(MdbHandle *mdb, MdbColumn *col, MdbSargNode *node, MdbField *field)
{ {
char tmpbuf[256]; char tmpbuf[256];
char* val;
int ret;
if (node->op == MDB_ISNULL) if (node->op == MDB_ISNULL)
return field->is_null?1:0; return field->is_null?1:0;
@ -233,6 +235,13 @@ mdb_test_sarg(MdbHandle *mdb, MdbColumn *col, MdbSargNode *node, MdbField *field
case MDB_TEXT: case MDB_TEXT:
mdb_unicode2ascii(mdb, field->value, field->siz, tmpbuf, 256); mdb_unicode2ascii(mdb, field->value, field->siz, tmpbuf, 256);
return mdb_test_string(node, tmpbuf); 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: case MDB_DATETIME:
return mdb_test_double(node->op, poor_mans_trunc(node->value.d), poor_mans_trunc(mdb_get_double(field->value, 0))); return mdb_test_double(node->op, poor_mans_trunc(node->value.d), poor_mans_trunc(mdb_get_double(field->value, 0)));
default: default: