lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-06-28 13:45:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch wheredate.diff from Nirgal

Browse Source
This commit is contained in:
Nirgal Vourgre 2011-08-28 19:47:18 -04:00 committed by Brian Bruns
parent 230dfc8b2b
commit fba597765d
3 changed files with 75 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mdbtools.h
View File

@ -462,6 +462,7 @@ extern const char *mdb_col_get_prop(const MdbColumn *col, const gchar *key);
/* data.c */
extern int mdb_bind_column_by_name(MdbTableDef *table, gchar *col_name, void *bind_ptr, int *len_ptr);
extern void mdb_data_dump(MdbTableDef *table);
extern void mdb_date_to_tm(double td, struct tm *t);
extern void mdb_bind_column(MdbTableDef *table, int col_num, void *bind_ptr, int *len_ptr);
extern int mdb_rewind_table(MdbTableDef *table);
extern int mdb_fetch_row(MdbTableDef *table);

49
src/libmdb/data.c
View File

@ -779,56 +779,63 @@ static int trim_trailing_zeros(char * buff)
/* Date/Time is stored as a double, where the whole
part is the days from 12/30/1899 and the fractional
part is the fractional part of one day. */
static char *
mdb_date_to_string(MdbHandle *mdb, int start)
void
mdb_date_to_tm(double td, struct tm *t)
{
struct tm t;
long int day, time;
int yr, q;
int *cal;
int noleap_cal[] = {0,31,59,90,120,151,181,212,243,273,304,334,365};
int leap_cal[] = {0,31,60,91,121,152,182,213,244,274,305,335,366};
char *text = (char *) g_malloc(MDB_BIND_SIZE);
double td = mdb_get_double(mdb->pg_buf, start);
day = (long int)(td);
time = (long int)(fabs(td - day) * 86400.0 + 0.5);
t.tm_hour = time / 3600;
t.tm_min = (time / 60) % 60;
t.tm_sec = time % 60;
t.tm_year = 1 - 1900;
t->tm_hour = time / 3600;
t->tm_min = (time / 60) % 60;
t->tm_sec = time % 60;
t->tm_year = 1 - 1900;
day += 693593; /* Days from 1/1/1 to 12/31/1899 */
t.tm_wday = (day+1) % 7;
t->tm_wday = (day+1) % 7;
q = day / 146097; /* 146097 days in 400 years */
t.tm_year += 400 * q;
t->tm_year += 400 * q;
day -= q * 146097;
q = day / 36524; /* 36524 days in 100 years */
if (q > 3) q = 3;
t.tm_year += 100 * q;
t->tm_year += 100 * q;
day -= q * 36524;
q = day / 1461; /* 1461 days in 4 years */
t.tm_year += 4 * q;
t->tm_year += 4 * q;
day -= q * 1461;
q = day / 365; /* 365 days in 1 year */
if (q > 3) q = 3;
t.tm_year += q;
t->tm_year += q;
day -= q * 365;
yr = t.tm_year + 1900;
yr = t->tm_year + 1900;
cal = ((yr)%4==0 && ((yr)%100!=0 || (yr)%400==0)) ?
leap_cal : noleap_cal;
for (t.tm_mon=0; t.tm_mon<12; t.tm_mon++) {
if (day < cal[t.tm_mon+1]) break;
for (t->tm_mon=0; t->tm_mon<12; t->tm_mon++) {
if (day < cal[t->tm_mon+1]) break;
}
t.tm_mday = day - cal[t.tm_mon] + 1;
t.tm_yday = day;
t.tm_isdst = -1;
t->tm_mday = day - cal[t->tm_mon] + 1;
t->tm_yday = day;
t->tm_isdst = -1;
}
static char *
mdb_date_to_string(MdbHandle *mdb, int start)
{
struct tm t;
char *text = (char *) g_malloc(MDB_BIND_SIZE);
double td = mdb_get_double(mdb->pg_buf, start);
mdb_date_to_tm(td, &t);
strftime(text, MDB_BIND_SIZE, date_fmt, &t);

49
src/libmdb/sargs.c
View File

@ -28,7 +28,7 @@
* a mdb_test_[type]() function and invoke it from mdb_test_sarg()
*/
#include "mdbtools.h"
#include <time.h>
#ifdef DMALLOC
#include "dmalloc.h"
#endif
@ -97,8 +97,49 @@ int mdb_test_int(MdbSargNode *node, gint32 i)
}
return 0;
}
#if 0
#endif
int
mdb_test_date(MdbSargNode *node, double td)
{
struct tm found;
char date_tmp[MDB_BIND_SIZE]; //you should figure out a way to pull mdb_date_to_string in here
time_t found_t;
time_t asked_t;
double diff;
mdb_date_to_tm(td, &found);
asked_t = node->value.i;
found_t = mktime(&found);
diff = difftime(asked_t, found_t);
switch (node->op) {
case MDB_EQUAL:
if (diff==0) return 1;
break;
case MDB_GT:
if (diff<0) return 1;
break;
case MDB_LT:
if (diff>0) return 1;
break;
case MDB_GTEQ:
if (diff<=0) return 1;
break;
case MDB_LTEQ:
if (diff>=0) return 1;
break;
default:
fprintf(stderr, "Calling mdb_test_sarg on unknown operator. Add code to mdb_test_date() for operator %d\n", node->op);
break;
}
return 0;
}
int
mdb_find_indexable_sargs(MdbSargNode *node, gpointer data)
{
@ -155,6 +196,8 @@ 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_DATETIME:
return mdb_test_date(node, mdb_get_double(field->value, 0));
default:
fprintf(stderr, "Calling mdb_test_sarg on unknown type. Add code to mdb_test_sarg() for type %d\n",col->col_type);
break;