88 *
99 * Copyright (c) 1994, Regents of the University of California
1010 *
11- * $Id: dt.h,v 1.12 1997/06/23 15:03:45 thomas Exp $
11+ * $Id: dt.h,v 1.13 1997/07/01 00:25:30 thomas Exp $
1212 *
1313 *-------------------------------------------------------------------------
1414 */
@@ -129,10 +129,10 @@ typedef struct {
129129#define DTK_NUMBER 0
130130#define DTK_STRING 1
131131
132- #define DTK_DATETIME 2
133- #define DTK_DATE 3
134- #define DTK_TIME 4
135- #define DTK_TZ 5
132+ #define DTK_DATE 2
133+ #define DTK_TIME 3
134+ #define DTK_TZ
135+ #define DTK_AGO 5
136136
137137#define DTK_SPECIAL 6
138138#define DTK_INVALID 7
@@ -160,7 +160,7 @@ typedef struct {
160160#define DTK_MILLENIUM 28
161161#define DTK_MILLISEC 29
162162#define DTK_MICROSEC 30
163- #define DTK_AGO 31
163+ #define DTK_DOW 31
164164
165165/*
166166 * Bit mask definitions for time parsing.
@@ -268,8 +268,11 @@ extern text *datetime_text(DateTime *datetime);
268268extern DateTime * text_datetime (text * str );
269269extern text * timespan_text (TimeSpan * timespan );
270270extern TimeSpan * text_timespan (text * str );
271+ extern DateTime * datetime_trunc (text * units ,DateTime * datetime );
272+ extern TimeSpan * timespan_trunc (text * units ,TimeSpan * timespan );
271273extern float64 datetime_part (text * units ,DateTime * datetime );
272274extern float64 timespan_part (text * units ,TimeSpan * timespan );
275+ extern text * datetime_zone (text * zone ,DateTime * datetime );
273276
274277extern TimeSpan * timespan_um (TimeSpan * span );
275278extern TimeSpan * timespan_add (TimeSpan * span1 ,TimeSpan * span2 );
@@ -278,6 +281,7 @@ extern TimeSpan *timespan_sub(TimeSpan *span1, TimeSpan *span2);
278281extern TimeSpan * datetime_sub (DateTime * dt1 ,DateTime * dt2 );
279282extern DateTime * datetime_add_span (DateTime * dt ,TimeSpan * span );
280283extern DateTime * datetime_sub_span (DateTime * dt ,TimeSpan * span );
284+ extern TimeSpan * datetime_age (DateTime * dt1 ,DateTime * dt2 );
281285
282286extern void GetCurrentTime (struct tm * tm );
283287extern DateTime SetDateTime (DateTime datetime );
@@ -317,6 +321,8 @@ extern int DecodeDateDelta( char *field[], int ftype[],
317321extern int DecodeUnits (int field ,char * lowtoken ,int * val );
318322
319323extern int EncodeSpecialDateTime (DateTime dt ,char * str );
324+ extern int EncodeDateOnly (struct tm * tm ,int style ,char * str );
325+ extern int EncodeTimeOnly (struct tm * tm ,double fsec ,int style ,char * str );
320326extern int EncodeDateTime (struct tm * tm ,double fsec ,int * tzp ,char * * tzn ,int style ,char * str );
321327extern int EncodeTimeSpan (struct tm * tm ,double fsec ,int style ,char * str );
322328
