aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/dt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/adt/dt.c')
-rw-r--r--src/backend/utils/adt/dt.c2185
1 files changed, 2161 insertions, 24 deletions
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index c9a53230cb0..3dd91d7f9bb 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,52 +7,2189 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.2 1996/11/03 06:53:04 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.3 1997/03/14 23:20:10 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
+#include <stdio.h>
+#include <ctype.h>
+#include <math.h>
+#include <string.h>
+#include <sys/types.h>
+
#include "postgres.h"
-#include "utils/palloc.h"
-#include "utils/builtins.h" /* where function declarations go */
+#include "utils/builtins.h"
+
+extern int EuroDates;
+
+#define MAXDATEFIELDS 25
+
+#define USE_DATE_CACHE 1
+
+extern char *tzname[2];
+extern long int timezone;
+extern int daylight;
+
+#define JTIME_INVALID (infnan(0))
+#define DATETIME_INVALID(j) {*j = JTIME_INVALID;}
+#define DATETIME_IS_INVALID(j) (isnan(*j))
+
+#define JTIME_NOBEGIN (infnan(-ERANGE))
+#define DATETIME_NOBEGIN(j) {*j = JTIME_NOBEGIN;}
+#define DATETIME_IS_NOBEGIN(j) (*j == JTIME_NOBEGIN)
+
+#define JTIME_NOEND (infnan(ERANGE))
+#define DATETIME_NOEND(j) {*j = JTIME_NOEND;}
+#define DATETIME_IS_NOEND(j) (*j == JTIME_NOEND)
+
+#define JTIME_CURRENT (MINDOUBLE)
+#define DATETIME_CURRENT(j) {*j = JTIME_CURRENT;}
+#define DATETIME_IS_CURRENT(j) (*j == MINDOUBLE)
+
+#define JTIME_EPOCH (-MINDOUBLE)
+#define DATETIME_EPOCH(j) {*j = JTIME_EPOCH;}
+#define DATETIME_IS_EPOCH(j) (*j == JTIME_EPOCH)
+
+#define DATETIME_IS_RESERVED(j) (*j < 0)
+#undef DATETIME_IS_RESERVED
+#define DATETIME_IS_RESERVED(j) (DATETIME_IS_INVALID(j) \
+ || DATETIME_IS_NOBEGIN(j) || DATETIME_IS_NOEND(j) \
+ || DATETIME_IS_CURRENT(j) || DATETIME_IS_EPOCH(j))
+
+#define TIME_PREC 1e-6
+#define JROUND(j) (rint(((double) j)/TIME_PREC)*TIME_PREC)
/*****************************************************************************
* USER I/O ROUTINES *
*****************************************************************************/
-/*
- * dtin - converts "nseconds" to internal representation
- *
- * XXX Currently, just creates an integer.
+
+/* datetime_in()
+ * Convert a string to internal form.
*/
-int32 dtin(char *datetime)
+DateTime *
+datetime_in(char *str)
{
- if (datetime == NULL)
- return((int32) 0);
- return((int32) atol(datetime));
-}
+ DateTime *result;
-/*
- * dtout - converts internal form to "..."
+ double date, time;
+ double fsec;
+ struct tm tt, *tm = &tt;
+ int tzp;
+ int dtype;
+ int nf;
+ char *field[MAXDATEFIELDS];
+ int ftype[MAXDATEFIELDS];
+ char lowstr[MAXDATELEN];
+
+ if (!PointerIsValid(str))
+ elog (WARN, "Bad (null) datetime external representation", NULL);
+
+ if ((ParseDateTime( str, lowstr, field, ftype, MAXDATEFIELDS, &nf) != 0)
+ || (DecodeDateTime( field, ftype, nf, &dtype, tm, &fsec, &tzp) != 0))
+ elog (WARN,"Bad datetime external representation %s",str);
+
+ if (!PointerIsValid(result = PALLOCTYPE(DateTime)))
+ elog(WARN, "Memory allocation failed, can't input datetime '%s'",str);
+
+ switch (dtype) {
+ case DTK_DATE:
+ date = (date2j(tm->tm_year,tm->tm_mon,tm->tm_mday)-date2j(2000,1,1));
+ time = time2t(tm->tm_hour,tm->tm_min,(tm->tm_sec + fsec));
+ *result = (date*86400+time);
+#ifdef DATEDEBUG
+printf( "datetime_in- date is %f (%f %f %d)\n", *result, date, time, (((tm->tm_hour*60)+tm->tm_min)*60+tm->tm_sec));
+printf( "datetime_in- time is %f %02d:%02d:%02d %f\n", time, tm->tm_hour, tm->tm_min, tm->tm_sec, fsec);
+#endif
+ if (tzp != 0) {
+ *result = dt2local(*result, -tzp);
+ } else {
+ *result = dt2local(*result, -timezone);
+ };
+#ifdef DATEDEBUG
+printf( "datetime_in- date is %f\n", *result);
+#endif
+
+ break;
+
+ case DTK_EPOCH:
+ DATETIME_EPOCH(result);
+ break;
+
+ case DTK_CURRENT:
+ DATETIME_CURRENT(result);
+ break;
+
+ case DTK_LATE:
+ DATETIME_NOEND(result);
+ break;
+
+ case DTK_EARLY:
+ DATETIME_NOBEGIN(result);
+ break;
+
+ case DTK_INVALID:
+ DATETIME_INVALID(result);
+ break;
+
+ default:
+ elog(WARN, "Internal coding error, can't input datetime '%s'",str);
+ };
+
+ return(result);
+} /* datetime_in() */
+
+/* datetime_out()
+ * Convert a datetime to external form.
+ */
+char *
+datetime_out(DateTime *dt)
+{
+ char *result;
+ struct tm tt, *tm = &tt;
+ double date, time, sec, fsec;
+ char buf[MAXDATELEN];
+
+ if (!PointerIsValid(dt))
+ return(NULL);
+
+ if (DATETIME_IS_RESERVED(dt)) {
+ EncodeSpecialDateTime(dt, buf);
+
+ } else {
+
+ time = (modf( dt2local( *dt, timezone)/86400, &date)*86400);
+ date += date2j(2000,1,1);
+ if (time < 0) {
+ time += 86400;
+ date -= 1;
+ };
+
+#ifdef DATEDEBUG
+printf( "datetime_out- date is %f (%f %f)\n", *dt, date, time);
+#endif
+
+ j2date((int) date, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
+ dt2time( time, &tm->tm_hour, &tm->tm_min, &sec);
+
+#ifdef DATEDEBUG
+printf( "datetime_out- date is %d.%02d.%02d\n", tm->tm_year, tm->tm_mon, tm->tm_mday);
+printf( "datetime_out- time is %02d:%02d:%2.2f\n", tm->tm_hour, tm->tm_min, sec);
+#endif
+
+ fsec = modf(JROUND(sec),&sec);
+ tm->tm_sec = sec;
+
+#ifdef DATEDEBUG
+printf( "datetime_out- time is %02d:%02d:%02d %.7f\n", tm->tm_hour, tm->tm_min, tm->tm_sec, fsec);
+#endif
+
+ tm->tm_isdst = -1;
+
+#ifdef DATEDEBUG
+printf( "datetime_out- timezone is %s/%s; offset is %ld; daylight is %d\n",
+ tzname[0], tzname[1], timezone, daylight);
+#endif
+
+ EncodePostgresDate(tm, fsec, buf);
+
+ };
+
+ if (!PointerIsValid(result = PALLOC(strlen(buf)+1)))
+ elog(WARN, "Memory allocation failed, can't output datetime", NULL);
+
+ strcpy( result, buf);
+
+ return( result);
+} /* datetime_out() */
+
+
+/* timespan_in()
+ * Convert a string to internal form.
*
- * XXX assumes sign, 10 digits max, '\0'
+ * External format(s):
+ * Uses the generic date/time parsing and decoding routines.
*/
-char *dtout(int32 datetime)
+TimeSpan *
+timespan_in(char *str)
{
- char *result;
-
- result = (char *) palloc(12);
- Assert(result);
- ltoa(datetime, result);
- return(result);
-}
+ TimeSpan *span;
+
+ double fsec;
+ struct tm tt, *tm = &tt;
+ int dtype;
+ int nf;
+ char *field[MAXDATEFIELDS];
+ int ftype[MAXDATEFIELDS];
+ char lowstr[MAXDATELEN];
+
+ tm->tm_year = 0;
+ tm->tm_mon = 0;
+ tm->tm_mday = 0;
+ tm->tm_hour = 0;
+ tm->tm_min = 0;
+ tm->tm_sec = 0;
+ fsec = 0;
+
+ if (!PointerIsValid(str))
+ elog (WARN, "Bad (null) timespan external representation", NULL);
+
+ if ((ParseDateTime( str, lowstr, field, ftype, MAXDATEFIELDS, &nf) != 0)
+ || (DecodeDateDelta( field, ftype, nf, &dtype, tm, &fsec) != 0))
+ elog (WARN,"Bad timespan external representation %s",str);
+
+ if (!PointerIsValid(span = PALLOCTYPE(TimeSpan)))
+ elog(WARN, "Memory allocation failed, can't input timespan '%s'",str);
+
+ switch (dtype) {
+ case DTK_DELTA:
+
+ span->month = ((tm->tm_year*12)+tm->tm_mon);
+ span->time = ((((((tm->tm_mday*24)+tm->tm_hour)*60)+tm->tm_min)*60)+tm->tm_sec);
+ span->time = JROUND(span->time + fsec);
+
+#ifdef DATEDEBUG
+printf( "timespan_in- %d %f = %04d-%02d-%02d %02d:%02d:%02d %.2f\n", span->month, span->time,
+ tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, fsec);
+#endif
+
+ break;
+
+ default:
+ elog(WARN, "Internal coding error, can't input timespan '%s'",str);
+ };
+
+ return(span);
+} /* timespan_in() */
+
+/* timespan_out()
+ * Convert a time span to external form.
+ */
+char *
+timespan_out(TimeSpan *span)
+{
+ char *result;
+
+ struct tm tt, *tm = &tt;
+ double time, iunit, funit, fsec = 0;
+ char buf[MAXDATELEN];
+
+ if (!PointerIsValid(span))
+ return(NULL);
+
+ if (span->month != 0) {
+ tm->tm_year = span->month / 12;
+ tm->tm_mon = span->month % 12;
+
+ } else {
+ tm->tm_year = 0;
+ tm->tm_mon = 0;
+ };
+
+#if FALSE
+ time = JROUND(span->time);
+#endif
+ time = span->time;
+
+ funit = modf( (time / 86400), &iunit);
+ tm->tm_mday = iunit;
+ if (tm->tm_mday != 0) time -= rint(tm->tm_mday * 86400);
+
+ funit = modf( (time / 3600), &iunit);
+ tm->tm_hour = iunit;
+ if (tm->tm_hour != 0) time -= rint(tm->tm_hour * 3600e0);
+ funit = modf( (time / 60), &iunit);
+ tm->tm_min = iunit;
+ if (tm->tm_min != 0) time -= rint(tm->tm_min * 60e0);
+ funit = modf( time, &iunit);
+ tm->tm_sec = iunit;
+ if (tm->tm_sec != 0) time -= tm->tm_sec;
+ fsec = time;
+
+#ifdef DATEDEBUG
+printf( "timespan_out- %d %f = %04d-%02d-%02d %02d:%02d:%02d %.2f\n", span->month, span->time,
+ tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, fsec);
+#endif
+
+ if (EncodePostgresSpan(tm, fsec, buf) != 0)
+ elog(WARN,"Unable to format timespan",NULL);
+
+ if (!PointerIsValid(result = PALLOC(strlen(buf)+1)))
+ elog(WARN,"Memory allocation failed, can't output timespan",NULL);
+
+ strcpy( result, buf);
+ return( result);
+} /* timespan_out() */
+
/*****************************************************************************
* PUBLIC ROUTINES *
*****************************************************************************/
/* (see int.c for comparison/operation routines) */
+
/*****************************************************************************
* PRIVATE ROUTINES *
*****************************************************************************/
-/* (none) */
+
+#if USE_NEW_TIME_CODE
+#define DATE_MAXLEN 47
+#endif
+
+/* definitions for squeezing values into "value" */
+#define ABS_SIGNBIT 0200
+#define VALMASK 0177
+#define NEG(n) ((n)|ABS_SIGNBIT)
+#define SIGNEDCHAR(c) ((c)&ABS_SIGNBIT? -((c)&VALMASK): (c))
+#define FROMVAL(tp) (-SIGNEDCHAR((tp)->value) * 10) /* uncompress */
+#define TOVAL(tp, v) ((tp)->value = ((v) < 0? NEG((-(v))/10): (v)/10))
+
+/*
+ * to keep this table reasonably small, we divide the lexval for TZ and DTZ
+ * entries by 10 and truncate the text field at MAXTOKLEN characters.
+ * the text field is not guaranteed to be NULL-terminated.
+ */
+static datetkn datetktbl[] = {
+/* text token lexval */
+{ EARLY, RESERV, DTK_EARLY}, /* "-infinity" reserved for "early time" */
+{ "acsst", DTZ, 63}, /* Cent. Australia */
+{ "acst", TZ, 57}, /* Cent. Australia */
+{ DA_D, ADBC, AD}, /* "ad" for years >= 0 */
+{ "abstime", IGNORE, 0}, /* "abstime" for pre-v6.1 "Invalid Abstime" */
+{ "adt", DTZ, NEG(18)}, /* Atlantic Daylight Time */
+{ "aesst", DTZ, 66}, /* E. Australia */
+{ "aest", TZ, 60}, /* Australia Eastern Std Time */
+{ "ahst", TZ, 60}, /* Alaska-Hawaii Std Time */
+{ "allballs", RESERV, DTK_ZULU}, /* 00:00:00 */
+{ "am", AMPM, AM},
+{ "apr", MONTH, 4},
+{ "april", MONTH, 4},
+{ "ast", TZ, NEG(24)}, /* Atlantic Std Time (Canada) */
+{ "at", IGNORE, 0}, /* "at" (throwaway) */
+{ "aug", MONTH, 8},
+{ "august", MONTH, 8},
+{ "awsst", DTZ, 54}, /* W. Australia */
+{ "awst", TZ, 48}, /* W. Australia */
+{ DB_C, ADBC, BC}, /* "bc" for years < 0 */
+{ "bst", TZ, 6}, /* British Summer Time */
+{ "bt", TZ, 18}, /* Baghdad Time */
+{ "cadt", DTZ, 63}, /* Central Australian DST */
+{ "cast", TZ, 57}, /* Central Australian ST */
+{ "cat", TZ, NEG(60)}, /* Central Alaska Time */
+{ "cct", TZ, 48}, /* China Coast */
+{ "cdt", DTZ, NEG(30)}, /* Central Daylight Time */
+{ "cet", TZ, 6}, /* Central European Time */
+{ "cetdst", DTZ, 12}, /* Central European Dayl.Time */
+{ "cst", TZ, NEG(36)}, /* Central Standard Time */
+{ DCURRENT, RESERV, DTK_CURRENT}, /* "current" is always now */
+{ "dec", MONTH, 12},
+{ "december", MONTH, 12},
+{ "dnt", TZ, 6}, /* Dansk Normal Tid */
+{ "dst", IGNORE, 0},
+{ "east", TZ, NEG(60)}, /* East Australian Std Time */
+{ "edt", DTZ, NEG(24)}, /* Eastern Daylight Time */
+{ "eet", TZ, 12}, /* East. Europe, USSR Zone 1 */
+{ "eetdst", DTZ, 18}, /* Eastern Europe */
+{ EPOCH, RESERV, DTK_EPOCH}, /* "epoch" reserved for system epoch time */
+{ "est", TZ, NEG(30)}, /* Eastern Standard Time */
+{ "feb", MONTH, 2},
+{ "february", MONTH, 2},
+{ "fri", DOW, 5},
+{ "friday", DOW, 5},
+{ "fst", TZ, 6}, /* French Summer Time */
+{ "fwt", DTZ, 12}, /* French Winter Time */
+{ "gmt", TZ, 0}, /* Greenwish Mean Time */
+{ "gst", TZ, 60}, /* Guam Std Time, USSR Zone 9 */
+{ "hdt", DTZ, NEG(54)}, /* Hawaii/Alaska */
+{ "hmt", DTZ, 18}, /* Hellas ? ? */
+{ "hst", TZ, NEG(60)}, /* Hawaii Std Time */
+{ "idle", TZ, 72}, /* Intl. Date Line, East */
+{ "idlw", TZ, NEG(72)}, /* Intl. Date Line, West */
+{ LATE, RESERV, DTK_LATE}, /* "infinity" reserved for "late time" */
+{ INVALID, RESERV, DTK_INVALID}, /* "invalid" reserved for invalid time */
+{ "ist", TZ, 12}, /* Israel */
+{ "it", TZ, 22}, /* Iran Time */
+{ "jan", MONTH, 1},
+{ "january", MONTH, 1},
+{ "jst", TZ, 54}, /* Japan Std Time,USSR Zone 8 */
+{ "jt", TZ, 45}, /* Java Time */
+{ "jul", MONTH, 7},
+{ "july", MONTH, 7},
+{ "jun", MONTH, 6},
+{ "june", MONTH, 6},
+{ "kst", TZ, 54}, /* Korea Standard Time */
+{ "ligt", TZ, 60}, /* From Melbourne, Australia */
+{ "mar", MONTH, 3},
+{ "march", MONTH, 3},
+{ "may", MONTH, 5},
+{ "mdt", DTZ, NEG(36)}, /* Mountain Daylight Time */
+{ "mest", DTZ, 12}, /* Middle Europe Summer Time */
+{ "met", TZ, 6}, /* Middle Europe Time */
+{ "metdst", DTZ, 12}, /* Middle Europe Daylight Time*/
+{ "mewt", TZ, 6}, /* Middle Europe Winter Time */
+{ "mez", TZ, 6}, /* Middle Europe Zone */
+{ "mon", DOW, 1},
+{ "monday", DOW, 1},
+{ "mst", TZ, NEG(42)}, /* Mountain Standard Time */
+{ "mt", TZ, 51}, /* Moluccas Time */
+{ "ndt", DTZ, NEG(15)}, /* Nfld. Daylight Time */
+{ "nft", TZ, NEG(21)}, /* Newfoundland Standard Time */
+{ "nor", TZ, 6}, /* Norway Standard Time */
+{ "nov", MONTH, 11},
+{ "november", MONTH, 11},
+{ NOW, RESERV, DTK_NOW}, /* current transaction time */
+{ "nst", TZ, NEG(21)}, /* Nfld. Standard Time */
+{ "nt", TZ, NEG(66)}, /* Nome Time */
+{ "nzdt", DTZ, 78}, /* New Zealand Daylight Time */
+{ "nzst", TZ, 72}, /* New Zealand Standard Time */
+{ "nzt", TZ, 72}, /* New Zealand Time */
+{ "oct", MONTH, 10},
+{ "october", MONTH, 10},
+{ "on", IGNORE, 0}, /* "on" (throwaway) */
+{ "pdt", DTZ, NEG(42)}, /* Pacific Daylight Time */
+{ "pm", AMPM, PM},
+{ "pst", TZ, NEG(48)}, /* Pacific Standard Time */
+{ "sadt", DTZ, 63}, /* S. Australian Dayl. Time */
+{ "sast", TZ, 57}, /* South Australian Std Time */
+{ "sat", DOW, 6},
+{ "saturday", DOW, 6},
+{ "sep", MONTH, 9},
+{ "sept", MONTH, 9},
+{ "september", MONTH, 9},
+{ "set", TZ, NEG(6)}, /* Seychelles Time ?? */
+{ "sst", DTZ, 12}, /* Swedish Summer Time */
+{ "sun", DOW, 0},
+{ "sunday", DOW, 0},
+{ "swt", TZ, 6}, /* Swedish Winter Time */
+{ "thu", DOW, 4},
+{ "thur", DOW, 4},
+{ "thurs", DOW, 4},
+{ "thursday", DOW, 4},
+{ TODAY, RESERV, DTK_TODAY}, /* midnight */
+{ TOMORROW, RESERV, DTK_TOMORROW}, /* tomorrow midnight */
+{ "tue", DOW, 2},
+{ "tues", DOW, 2},
+{ "tuesday", DOW, 2},
+{ "undefined", RESERV, DTK_INVALID}, /* "undefined" pre-v6.1 invalid time */
+{ "ut", TZ, 0},
+{ "utc", TZ, 0},
+{ "wadt", DTZ, 48}, /* West Australian DST */
+{ "wast", TZ, 42}, /* West Australian Std Time */
+{ "wat", TZ, NEG(6)}, /* West Africa Time */
+{ "wdt", DTZ, 54}, /* West Australian DST */
+{ "wed", DOW, 3},
+{ "wednesday", DOW, 3},
+{ "weds", DOW, 3},
+{ "wet", TZ, 0}, /* Western Europe */
+{ "wetdst", DTZ, 6}, /* Western Europe */
+{ "wst", TZ, 48}, /* West Australian Std Time */
+{ "ydt", DTZ, NEG(48)}, /* Yukon Daylight Time */
+{ YESTERDAY, RESERV, DTK_YESTERDAY}, /* yesterday midnight */
+{ "yst", TZ, NEG(54)}, /* Yukon Standard Time */
+{ "zp4", TZ, NEG(24)}, /* GMT +4 hours. */
+{ "zp5", TZ, NEG(30)}, /* GMT +5 hours. */
+{ "zp6", TZ, NEG(36)}, /* GMT +6 hours. */
+{ ZULU, RESERV, DTK_ZULU}, /* 00:00:00 */
+};
+
+static unsigned int szdatetktbl = sizeof datetktbl / sizeof datetktbl[0];
+
+static datetkn deltatktbl[] = {
+/* text token lexval */
+{ "@", IGNORE, 0}, /* postgres relative time prefix */
+{ DAGO, AGO, 0}, /* "ago" indicates negative time offset */
+{ "c", UNITS, DTK_CENTURY}, /* "century" relative time units */
+{ "cent", UNITS, DTK_CENTURY}, /* "century" relative time units */
+{ "centuries", UNITS, DTK_CENTURY}, /* "centuries" relative time units */
+{ DCENTURY, UNITS, DTK_CENTURY}, /* "century" relative time units */
+{ "d", UNITS, DTK_DAY}, /* "day" relative time units */
+{ DDAY, UNITS, DTK_DAY}, /* "day" relative time units */
+{ "days", UNITS, DTK_DAY}, /* "days" relative time units */
+{ "dec", UNITS, DTK_DECADE}, /* "decade" relative time units */
+{ "decs", UNITS, DTK_DECADE}, /* "decades" relative time units */
+{ DDECADE, UNITS, DTK_DECADE}, /* "decade" relative time units */
+{ "decades", UNITS, DTK_DECADE}, /* "decades" relative time units */
+{ "h", UNITS, DTK_HOUR}, /* "hour" relative time units */
+{ DHOUR, UNITS, DTK_HOUR}, /* "hour" relative time units */
+{ "hours", UNITS, DTK_HOUR}, /* "hours" relative time units */
+{ "hr", UNITS, DTK_HOUR}, /* "hour" relative time units */
+{ "hrs", UNITS, DTK_HOUR}, /* "hours" relative time units */
+{ INVALID, RESERV, DTK_INVALID}, /* "invalid" reserved for invalid time */
+{ "m", UNITS, DTK_MINUTE}, /* "minute" relative time units */
+{ "microsecon", UNITS, DTK_MILLISEC}, /* "microsecond" relative time units */
+{ "mil", UNITS, DTK_MILLENIUM}, /* "millenium" relative time units */
+{ "mils", UNITS, DTK_MILLENIUM}, /* "millenia" relative time units */
+{ "millenia", UNITS, DTK_MILLENIUM}, /* "millenia" relative time units */
+{ DMILLENIUM, UNITS, DTK_MILLENIUM}, /* "millenium" relative time units */
+{ "milliseco", UNITS, DTK_MILLISEC}, /* "millisecond" relative time units */
+{ "min", UNITS, DTK_MINUTE}, /* "minute" relative time units */
+{ "mins", UNITS, DTK_MINUTE}, /* "minutes" relative time units */
+{ "mins", UNITS, DTK_MINUTE}, /* "minutes" relative time units */
+{ DMINUTE, UNITS, DTK_MINUTE}, /* "minute" relative time units */
+{ "minutes", UNITS, DTK_MINUTE}, /* "minutes" relative time units */
+{ "mon", UNITS, DTK_MONTH}, /* "months" relative time units */
+{ "mons", UNITS, DTK_MONTH}, /* "months" relative time units */
+{ DMONTH, UNITS, DTK_MONTH}, /* "month" relative time units */
+{ "months", UNITS, DTK_MONTH}, /* "months" relative time units */
+{ "ms", UNITS, DTK_MILLISEC}, /* "millisecond" relative time units */
+{ "msec", UNITS, DTK_MILLISEC}, /* "millisecond" relative time units */
+{ DMILLISEC, UNITS, DTK_MILLISEC}, /* "millisecond" relative time units */
+{ "mseconds", UNITS, DTK_MILLISEC}, /* "milliseconds" relative time units */
+{ "msecs", UNITS, DTK_MILLISEC}, /* "milliseconds" relative time units */
+{ "reltime", IGNORE, 0}, /* "reltime" for pre-v6.1 "Undefined Reltime" */
+{ "s", UNITS, DTK_SECOND}, /* "second" relative time units */
+{ "sec", UNITS, DTK_SECOND}, /* "second" relative time units */
+{ DSECOND, UNITS, DTK_SECOND}, /* "second" relative time units */
+{ "seconds", UNITS, DTK_SECOND}, /* "seconds" relative time units */
+{ "secs", UNITS, DTK_SECOND}, /* "seconds" relative time units */
+{ "undefined", RESERV, DTK_INVALID}, /* "undefined" pre-v6.1 invalid time */
+{ "us", UNITS, DTK_MICROSEC}, /* "microsecond" relative time units */
+{ "usec", UNITS, DTK_MICROSEC}, /* "microsecond" relative time units */
+{ DMICROSEC, UNITS, DTK_MICROSEC}, /* "microsecond" relative time units */
+{ "useconds", UNITS, DTK_MICROSEC}, /* "microseconds" relative time units */
+{ "usecs", UNITS, DTK_MICROSEC}, /* "microseconds" relative time units */
+{ "w", UNITS, DTK_WEEK}, /* "week" relative time units */
+{ DWEEK, UNITS, DTK_WEEK}, /* "week" relative time units */
+{ "weeks", UNITS, DTK_WEEK}, /* "weeks" relative time units */
+{ "y", UNITS, DTK_YEAR}, /* "year" relative time units */
+{ DYEAR, UNITS, DTK_YEAR}, /* "year" relative time units */
+{ "years", UNITS, DTK_YEAR}, /* "years" relative time units */
+{ "yr", UNITS, DTK_YEAR}, /* "year" relative time units */
+{ "yrs", UNITS, DTK_YEAR}, /* "years" relative time units */
+};
+
+static unsigned int szdeltatktbl = sizeof deltatktbl / sizeof deltatktbl[0];
+
+#if USE_DATE_CACHE
+datetkn *datecache[MAXDATEFIELDS] = {NULL};
+
+datetkn *deltacache[MAXDATEFIELDS] = {NULL};
+#endif
+
+
+/*
+ * Calendar time to Julian date conversions.
+ * Julian date is commonly used in astronomical applications,
+ * since it is numerically accurate and computationally simple.
+ * The algorithms here will accurately convert between Julian day
+ * and calendar date for all non-negative Julian days
+ * (i.e. from Nov 23, -4713 on).
+ *
+ * Ref: Explanatory Supplement to the Astronomical Almanac, 1992.
+ * University Science Books, 20 Edgehill Rd. Mill Valley CA 94941.
+ *
+ * These routines will be used by other date/time packages - tgl 97/02/25
+ */
+
+#define USE_FLIEGEL 1
+
+int
+date2j(int y, int m, int d)
+{
+#if USE_FLIEGEL
+ int m12 = (m-14)/12;
+
+ return((1461*(y+4800+m12))/4 + (367*(m-2-12*(m12)))/12
+ - (3*((y+4900+m12)/100))/4 + d - 32075);
+
+#else
+ int c, ya;
+
+ if (m > 2) {
+ m -= 3;
+ } else {
+ m += 9;
+ y--;
+ };
+ c = y/100;
+ ya = y - 100*c;
+ return((146097*c)/4+(1461*ya)/4+(153*m+2)/5+d+1721119);
+#endif
+} /* date2j() */
+
+void j2date( int jd, int *year, int *month, int *day)
+{
+ int j, y, m, d;
+
+#if USE_FLIEGEL
+ int i, l, n;
+
+ l = jd + 68569;
+ n = (4*l)/146097;
+ l -= (146097*n+3)/4;
+ i = (4000*(l+1))/1461001;
+ l += 31 - (1461*i)/4;
+ j = (80*l)/2447;
+ d = l - (2447*j)/80;
+ l = j/11;
+ m = (j+2) - (12*l);
+ y = 100*(n-49)+i+l;
+
+#else
+ j = jd - 1721119;
+ y = (4*j-1)/146097;
+ j = 4*j-1-146097*y;
+ d = j/4;
+ j = (4*d+3)/1461;
+ d = 4*d+3-1461*j;
+ d = (d+4)/4;
+ m = (5*d-3)/153;
+ d = 5*d-3-153*m;
+ d = (d+5)/5;
+ y = 100*y+j;
+ if (m < 10) {
+ m += 3;
+ } else {
+ m -= 9;
+ y++;
+ };
+#endif
+
+ *year = y;
+ *month = m;
+ *day = d;
+ return;
+} /* j2date() */
+
+int j2day( int date)
+{
+ int day;
+
+ day = (date+1) % 7;
+
+ return(day);
+} /* j2day() */
+
+
+DateTime dt2local(DateTime dt, int timezone)
+{
+ dt -= timezone;
+ dt = JROUND(dt);
+ return(dt);
+} /* dt2local() */
+
+double time2t(const int hour, const int min, const double sec)
+{
+ return((((hour*60)+min)*60)+sec);
+} /* time2t() */
+
+void dt2time(DateTime jd, int *hour, int *min, double *sec)
+{
+ double time;
+
+ time = jd;
+
+ *hour = (time/3600);
+ time -= ((*hour)*3600);
+ *min = (time/60);
+ time -= ((*min)*60);
+ *sec = JROUND(time);
+
+ return;
+} /* dt2time() */
+
+
+/*
+ * parse and convert date in timestr (the normal interface)
+ *
+ * Returns the number of seconds since epoch (J2000)
+ */
+
+#ifndef USE_POSIX_TIME
+long int timezone;
+long int daylight;
+#endif
+
+
+/* ParseDateTime()
+ * Break string into tokens based on a date/time context.
+ */
+int
+ParseDateTime( char *timestr, char *lowstr,
+ char *field[], int ftype[], int maxfields, int *numfields)
+{
+ int nf = 0;
+ char *cp = timestr;
+ char *lp = lowstr;
+
+#ifdef DATEDEBUG
+printf( "ParseDateTime- input string is %s\n", timestr);
+#endif
+ /* outer loop through fields */
+ while (*cp != '\0') {
+ field[nf] = lp;
+
+ /* leading digit? then date or time */
+ if (isdigit(*cp)) {
+ *lp++ = *cp++;
+ while (isdigit(*cp)) *lp++ = *cp++;
+ /* time field? */
+ if (*cp == ':') {
+ ftype[nf] = DTK_TIME;
+ while (isdigit(*cp) || (*cp == ':') || (*cp == '.'))
+ *lp++ = *cp++;
+
+ /* date field? allow embedded text month */
+ } else if ((*cp == '-') || (*cp == '/') || (*cp == '.')) {
+ ftype[nf] = DTK_DATE;
+ while (isalnum(*cp) || (*cp == '-') || (*cp == '/') || (*cp == '.'))
+ *lp++ = tolower(*cp++);
+
+ /* otherwise, number only and will determine year, month, or day later */
+ } else {
+ ftype[nf] = DTK_NUMBER;
+ };
+
+ /* text? then date string, month, day of week, special, or timezone */
+ } else if (isalpha(*cp)) {
+ ftype[nf] = DTK_STRING;
+ *lp++ = tolower(*cp++);
+ while (isalpha(*cp)) *lp++ = tolower(*cp++);
+
+ /* full date string with leading text month? */
+ if ((*cp == '-') || (*cp == '/') || (*cp == '.')) {
+ ftype[nf] = DTK_DATE;
+ while (isdigit(*cp) || (*cp == '-') || (*cp == '/') || (*cp == '.'))
+ *lp++ = tolower(*cp++);
+ };
+
+ /* skip leading spaces */
+ } else if (isspace(*cp)) {
+ cp++;
+ continue;
+
+ /* sign? then special or numeric timezone */
+ } else if ((*cp == '+') || (*cp == '-')) {
+ *lp++ = *cp++;
+ /* soak up leading whitespace */
+ while (isspace(*cp)) cp++;
+ /* numeric timezone? */
+ if (isdigit(*cp)) {
+ ftype[nf] = DTK_TZ;
+ *lp++ = *cp++;
+ while (isdigit(*cp) || (*cp == ':')) *lp++ = *cp++;
+
+ /* special? */
+ } else if (isalpha(*cp)) {
+ ftype[nf] = DTK_SPECIAL;
+ *lp++ = tolower(*cp++);
+ while (isalpha(*cp)) *lp++ = tolower(*cp++);
+
+ /* otherwise something wrong... */
+ } else {
+ return -1;
+ };
+
+ /* ignore punctuation but use as delimiter */
+ } else if (ispunct(*cp)) {
+ cp++;
+ continue;
+
+ } else {
+ return -1;
+ };
+
+ /* force in a delimiter */
+ *lp++ = '\0';
+ nf++;
+ if (nf > MAXDATEFIELDS) {
+ return -1;
+ };
+#ifdef DATEDEBUG
+printf( "ParseDateTime- set field[%d] to %s type %d\n", (nf-1), field[nf-1], ftype[nf-1]);
+#endif
+ };
+
+ *numfields = nf;
+
+ return 0;
+} /* ParseDateTime() */
+
+
+/* DecodeDateTime()
+ * Interpret previously parsed fields for general date and time.
+ * Return 0 if full date, 1 if only time, and -1 if problems.
+ * External format(s):
+ * "<weekday> <month>-<day>-<year> <hour>:<minute>:<second>"
+ * "Fri Feb-7-1997 15:23:27"
+ * "Feb-7-1997 15:23:27"
+ * "2-7-1997 15:23:27"
+ * "1997-2-7 15:23:27"
+ * "1997.038 15:23:27" (day of year 1-366)
+ * Also supports input in compact time:
+ * "970207 152327"
+ * "97038 152327"
+ */
+int
+DecodeDateTime( char *field[], int ftype[], int nf,
+ int *dtype, struct tm *tm, double *fsec, int *tzp)
+{
+ int fmask = 0, tmask, type;
+ int i;
+ int flen, val;
+ int mer = HR24;
+ int bc = FALSE;
+
+ *dtype = DTK_DATE;
+ tm->tm_hour = 0;
+ tm->tm_min = 0;
+ tm->tm_sec = 0;
+ tm->tm_isdst = -1; /* don't know daylight savings time status apriori */
+ if (tzp != NULL) *tzp = timezone;
+
+ for (i = 0; i < nf; i++) {
+#ifdef DATEDEBUG
+printf( "DecodeDateTime- field[%d] is %s (type %d)\n", i, field[i], ftype[i]);
+#endif
+ switch (ftype[i]) {
+ case DTK_DATE:
+ if (DecodeDate(field[i], fmask, &tmask, tm) != 0) return -1;
+ break;
+
+ case DTK_TIME:
+ if (DecodeTime(field[i], fmask, &tmask, tm, fsec) != 0) return -1;
+ break;
+
+ case DTK_TZ:
+ if (tzp == NULL) return -1;
+ if (DecodeTimezone( field[i], tzp) != 0) return -1;
+ tmask = DTK_M(TZ);
+ break;
+
+ case DTK_NUMBER:
+ flen = strlen(field[i]);
+
+ if (flen > 4) {
+ if (DecodeNumberField( flen, field[i], fmask, &tmask, tm, fsec) != 0)
+ return -1;
+
+ } else {
+ if (DecodeNumber( flen, field[i], fmask, &tmask, tm, fsec) != 0)
+ return -1;
+ };
+ break;
+
+ case DTK_STRING:
+ case DTK_SPECIAL:
+ type = DecodeSpecial( i, field[i], &val);
+#ifdef DATEDEBUG
+printf( "DecodeDateTime- special field[%d] %s type=%d value=%d\n", i, field[i], type, val);
+#endif
+ if (type == IGNORE) continue;
+
+ tmask = DTK_M(type);
+ switch (type) {
+ case RESERV:
+#ifdef DATEDEBUG
+printf( "DecodeDateTime- RESERV field %s value is %d\n", field[i], val);
+#endif
+ switch (val) {
+ case DTK_NOW:
+ tmask = (DTK_DATE_M | DTK_TIME_M);
+ *dtype = DTK_DATE;
+ GetCurrentTime(tm);
+ break;
+
+ case DTK_YESTERDAY:
+ tmask = DTK_DATE_M;
+ *dtype = DTK_DATE;
+ GetCurrentTime(tm);
+ j2date( (date2j( tm->tm_year, tm->tm_mon, tm->tm_mday)-1),
+ &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
+ tm->tm_hour = 0;
+ tm->tm_min = 0;
+ tm->tm_sec = 0;
+ break;
+
+ case DTK_TODAY:
+ tmask = DTK_DATE_M;
+ *dtype = DTK_DATE;
+ GetCurrentTime(tm);
+ tm->tm_hour = 0;
+ tm->tm_min = 0;
+ tm->tm_sec = 0;
+ break;
+
+ case DTK_TOMORROW:
+ tmask = DTK_DATE_M;
+ *dtype = DTK_DATE;
+ GetCurrentTime(tm);
+ j2date( (date2j( tm->tm_year, tm->tm_mon, tm->tm_mday)+1),
+ &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
+ tm->tm_hour = 0;
+ tm->tm_min = 0;
+ tm->tm_sec = 0;
+ break;
+
+ case DTK_ZULU:
+ tmask = (DTK_TIME_M | DTK_M(TZ));
+ *dtype = DTK_DATE;
+ tm->tm_hour = 0;
+ tm->tm_min = 0;
+ tm->tm_sec = 0;
+ *tzp = 0;
+ break;
+
+ default:
+ *dtype = val;
+ };
+
+ break;
+
+ case MONTH:
+#ifdef DATEDEBUG
+printf( "DecodeDateTime- month field %s value is %d\n", field[i], val);
+#endif
+ tm->tm_mon = val;
+ break;
+
+ case DTZ:
+ tm->tm_isdst = 0;
+ /* FALLTHROUGH! */
+ case TZ:
+ if (tzp == NULL) return -1;
+ *tzp = val * 60;
+ break;
+
+ case IGNORE:
+ break;
+
+ case AMPM:
+ mer = val;
+ break;
+
+ case ADBC:
+ bc = (val == BC);
+ break;
+
+ case DOW:
+ tm->tm_wday = val;
+ break;
+
+ default:
+ return -1;
+ };
+ break;
+
+ default:
+ return -1;
+ };
+
+#ifdef DATEDEBUG
+printf( "DecodeDateTime- field[%d] %s (%08x/%08x) value is %d\n",
+ i, field[i], fmask, tmask, val);
+#endif
+
+ if (tmask & fmask) return -1;
+ fmask |= tmask;
+ };
+
+ /* there is no year zero in AD/BC notation; i.e. "1 BC" == year 0 */
+ if (bc) tm->tm_year = -(tm->tm_year-1);
+
+ if ((mer != HR24) && (tm->tm_hour > 12))
+ return -1;
+ if (mer == PM) tm->tm_hour += 12;
+
+#ifdef DATEDEBUG
+printf( "DecodeDateTime- mask %08x (%08x)", fmask, DTK_DATE_M);
+printf( " set y%04d m%02d d%02d", tm->tm_year, tm->tm_mon, tm->tm_mday);
+printf( " %02d:%02d:%02d\n", tm->tm_hour, tm->tm_min, tm->tm_sec);
+#endif
+
+ if ((*dtype == DTK_DATE) && ((fmask & DTK_DATE_M) != DTK_DATE_M))
+ return(((fmask & DTK_TIME_M) == DTK_TIME_M)? 1: -1);
+
+ return 0;
+} /* DecodeDateTime() */
+
+
+/* DecodeTimeOnly()
+ * Interpret parsed string as time fields only.
+ */
+int
+DecodeTimeOnly( char *field[], int ftype[], int nf, int *dtype, struct tm *tm, double *fsec)
+{
+ int fmask, tmask, type;
+ int i;
+ int flen, val;
+ int mer = HR24;
+
+ *dtype = DTK_TIME;
+ tm->tm_hour = 0;
+ tm->tm_min = 0;
+ tm->tm_sec = 0;
+ tm->tm_isdst = -1; /* don't know daylight savings time status apriori */
+
+ fmask = DTK_DATE_M;
+
+ for (i = 0; i < nf; i++) {
+#ifdef DATEDEBUG
+printf( "DecodeTimeOnly- field[%d] is %s (type %d)\n", i, field[i], ftype[i]);
+#endif
+ switch (ftype[i]) {
+ case DTK_TIME:
+ if (DecodeTime(field[i], fmask, &tmask, tm, fsec) != 0) return -1;
+ break;
+
+ case DTK_NUMBER:
+ flen = strlen(field[i]);
+
+ if (DecodeNumberField( flen, field[i], fmask, &tmask, tm, fsec) != 0)
+ return -1;
+ break;
+
+ case DTK_STRING:
+ case DTK_SPECIAL:
+ type = DecodeSpecial( i, field[i], &val);
+#ifdef DATEDEBUG
+printf( "DecodeTimeOnly- special field[%d] %s type=%d value=%d\n", i, field[i], type, val);
+#endif
+ if (type == IGNORE) continue;
+
+ tmask = DTK_M(type);
+ switch (type) {
+ case RESERV:
+#ifdef DATEDEBUG
+printf( "DecodeTimeOnly- RESERV field %s value is %d\n", field[i], val);
+#endif
+ switch (val) {
+ case DTK_NOW:
+ tmask = DTK_TIME_M;
+ *dtype = DTK_TIME;
+ GetCurrentTime(tm);
+ break;
+
+ case DTK_ZULU:
+ tmask = (DTK_TIME_M | DTK_M(TZ));
+ *dtype = DTK_TIME;
+ tm->tm_hour = 0;
+ tm->tm_min = 0;
+ tm->tm_sec = 0;
+ tm->tm_isdst = -1;
+ break;
+
+ default:
+ return -1;
+ };
+
+ break;
+
+ case IGNORE:
+ break;
+
+ case AMPM:
+ mer = val;
+ break;
+
+ default:
+ return -1;
+ };
+ break;
+
+ default:
+ return -1;
+ };
+
+ if (tmask & fmask) return -1;
+ fmask |= tmask;
+
+#ifdef DATEDEBUG
+printf( "DecodeTimeOnly- field[%d] %s value is %d\n", i, field[i], val);
+#endif
+ };
+
+#ifdef DATEDEBUG
+printf( "DecodeTimeOnly- mask %08x (%08x)", fmask, DTK_TIME_M);
+printf( " %02d:%02d:%02d (%f)\n", tm->tm_hour, tm->tm_min, tm->tm_sec, *fsec);
+#endif
+
+ if ((mer != HR24) && (tm->tm_hour > 12))
+ return -1;
+ if (mer == PM) tm->tm_hour += 12;
+
+ if ((fmask & DTK_TIME_M) != DTK_TIME_M)
+ return -1;
+
+ return 0;
+} /* DecodeTimeOnly() */
+
+
+/* DecodeDate()
+ * Decode date string which includes delimiters.
+ * Insist on a complete set of fields.
+ */
+int
+DecodeDate(char *str, int fmask, int *tmask, struct tm *tm)
+{
+ double fsec;
+
+ int nf = 0;
+ int i, len;
+ int type, val, dmask = 0;
+ char *field[MAXDATEFIELDS];
+
+ /* parse this string... */
+ while ((*str != '\0') && (nf < MAXDATEFIELDS)) {
+ /* skip field separators */
+ while (! isalnum(*str)) str++;
+
+ field[nf] = str;
+ if (isdigit(*str)) {
+ while (isdigit(*str)) str++;
+ } else if (isalpha(*str)) {
+ while (isalpha(*str)) str++;
+ };
+
+ if (*str != '\0') *str++ = '\0';
+ nf++;
+ };
+
+ /* don't allow too many fields */
+ if (nf > 3) return -1;
+
+ *tmask = 0;
+
+ for (i = 0; i < nf; i++) {
+ str = field[i];
+ len = strlen(str);
+
+ if (len <= 0)
+ return -1;
+
+ if (isdigit(*str)) {
+ if (DecodeNumber( len, str, fmask, &dmask, tm, &fsec) != 0)
+ return -1;
+
+ } else if (isalpha(*str)) {
+ type = DecodeSpecial( i, field[i], &val);
+ if (type == IGNORE) continue;
+
+ dmask = DTK_M(type);
+ switch (type) {
+ case YEAR:
+#ifdef DATEDEBUG
+printf( "DecodeDate- year field %s value is %d\n", field[i], val);
+#endif
+ tm->tm_mon = val;
+ break;
+
+ case MONTH:
+#ifdef DATEDEBUG
+printf( "DecodeDate- month field %s value is %d\n", field[i], val);
+#endif
+ tm->tm_mon = val;
+ break;
+
+ case DAY:
+#ifdef DATEDEBUG
+printf( "DecodeDate- month field %s value is %d\n", field[i], val);
+#endif
+ tm->tm_mon = val;
+ break;
+
+ default:
+#ifdef DATEDEBUG
+printf( "DecodeDate- illegal field %s value is %d\n", field[i], val);
+#endif
+ return -1;
+ };
+ };
+
+ if (fmask & dmask) return -1;
+
+ fmask |= dmask;
+ *tmask |= dmask;
+ };
+
+ return 0;
+} /* DecodeDate() */
+
+
+/* DecodeTime()
+ * Decode time string which includes delimiters.
+ */
+int
+DecodeTime(char *str, int fmask, int *tmask, struct tm *tm, double *fsec)
+{
+ char *cp;
+
+ *tmask = DTK_TIME_M;
+
+ tm->tm_hour = strtol( str, &cp, 10);
+ if (*cp != ':') return -1;
+ str = cp+1;
+ tm->tm_min = strtol( str, &cp, 10);
+ if (*cp == '\0') {
+ tm->tm_sec = 0;
+ *fsec = 0;
+
+ } else if (*cp != ':') {
+ return -1;
+
+ } else {
+ str = cp+1;
+ tm->tm_sec = strtol( str, &cp, 10);
+ if (*cp == '\0') {
+ *fsec = 0;
+ } else if (*cp == '.') {
+ str = cp;
+ *fsec = strtod( str, &cp);
+ if (cp == str) return -1;
+ } else {
+ return -1;
+ };
+ };
+
+ return 0;
+} /* DecodeTime() */
+
+
+/* DecodeNumber()
+ * Interpret numeric field as a date value in context.
+ */
+int
+DecodeNumber( int flen, char *str, int fmask, int *tmask, struct tm *tm, double *fsec)
+{
+ int val;
+ char *cp;
+
+ *tmask = 0;
+
+ val = strtol( str, &cp, 10);
+ if (cp == str) return -1;
+ if (*cp == '.') {
+ *fsec = strtod( cp, &cp);
+ if (*cp != '\0') return -1;
+ };
+
+#ifdef DATEDEBUG
+printf( "DecodeNumber- %s is %d fmask=%08x tmask=%08x\n", str, val, fmask, *tmask);
+#endif
+
+ /* enough digits to be unequivocal year? */
+ if (flen == 4) {
+#ifdef DATEDEBUG
+printf( "DecodeNumber- match %d (%s) as year\n", val, str);
+#endif
+ *tmask = DTK_M(YEAR);
+ tm->tm_year = val;
+
+ /* special case day of year? */
+ } else if ((flen == 3) && (fmask & DTK_M(YEAR))
+ && ((val >= 1) && (val <= 366))) {
+ *tmask = (DTK_M(DOY) | DTK_M(MONTH) | DTK_M(DAY));
+ tm->tm_yday = val;
+ j2date((date2j(tm->tm_year,1,1)+tm->tm_yday-1),
+ &tm->tm_year,&tm->tm_mon,&tm->tm_mday);
+
+ /* already have year? then could be month */
+ } else if ((fmask && DTK_M(YEAR)) && (! (fmask & DTK_M(MONTH)))
+ && ((val >= 1) && (val <= 12))) {
+#ifdef DATEDEBUG
+printf( "DecodeNumber- match %d (%s) as month\n", val, str);
+#endif
+ *tmask = DTK_M(MONTH);
+ tm->tm_mon = val;
+
+ /* no year and EuroDates enabled? then could be day */
+#if USE_EURODATES
+ } else if ((EuroDates || (fmask & DTK_M(MONTH)))
+#else
+ } else if ((fmask & DTK_M(MONTH))
+#endif
+ && (! ((fmask & DTK_M(YEAR)) && (fmask & DTK_M(DAY))))
+ && ((val >= 1) && (val <= 31))) {
+#ifdef DATEDEBUG
+printf( "DecodeNumber- match %d (%s) as day\n", val, str);
+#endif
+ *tmask = DTK_M(DAY);
+ tm->tm_mday = val;
+
+ } else if ((! (fmask & DTK_M(MONTH)))
+ && ((val >= 1) && (val <= 12))) {
+#ifdef DATEDEBUG
+printf( "DecodeNumber- (2) match %d (%s) as month\n", val, str);
+#endif
+ *tmask = DTK_M(MONTH);
+ tm->tm_mon = val;
+
+ } else if (! (fmask & DTK_M(YEAR))) {
+#ifdef DATEDEBUG
+printf( "DecodeNumber- (2) match %d (%s) as year\n", val, str);
+#endif
+ *tmask = DTK_M(YEAR);
+ tm->tm_year = val;
+ if (tm->tm_year < 70) {
+ tm->tm_year += 2000;
+ } else if (tm->tm_year < 100) {
+ tm->tm_year += 1900;
+ };
+
+ } else {
+ return -1;
+ };
+
+ return 0;
+} /* DecodeNumber() */
+
+
+/* DecodeNumberField()
+ * Interpret numeric string as a concatenated date field.
+ */
+int
+DecodeNumberField( int len, char *str, int fmask, int *tmask, struct tm *tm, double *fsec)
+{
+ char *cp;
+
+ /* yyyymmdd? */
+ if (len == 8) {
+#ifdef DATEDEBUG
+printf( "DecodeNumberField- %s is 8 character date fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+
+ *tmask = DTK_DATE_M;
+
+ tm->tm_mday = atoi(str+6);
+ *(str+6) = '\0';
+ tm->tm_mon = atoi(str+4);
+ *(str+4) = '\0';
+ tm->tm_year = atoi(str+0);
+
+ /* yymmdd or hhmmss? */
+ } else if (len == 6) {
+#ifdef DATEDEBUG
+printf( "DecodeNumberField- %s is 6 characters fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+ if (fmask & DTK_DATE_M) {
+#ifdef DATEDEBUG
+printf( "DecodeNumberField- %s is time field fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+ *tmask = DTK_TIME_M;
+ tm->tm_sec = atoi(str+4);
+ *(str+4) = '\0';
+ tm->tm_min = atoi(str+2);
+ *(str+2) = '\0';
+ tm->tm_hour = atoi(str+0);
+
+ } else {
+#ifdef DATEDEBUG
+printf( "DecodeNumberField- %s is date field fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+ *tmask = DTK_DATE_M;
+ tm->tm_mday = atoi(str+4);
+ *(str+4) = '\0';
+ tm->tm_mon = atoi(str+2);
+ *(str+2) = '\0';
+ tm->tm_year = atoi(str+0);
+ };
+
+ } else if (index(str,'.') != NULL) {
+#ifdef DATEDEBUG
+printf( "DecodeNumberField- %s is time field fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+ *tmask = DTK_TIME_M;
+ tm->tm_sec = strtod( (str+4), &cp);
+ if (cp == (str+4)) return -1;
+ if (*cp == '.') {
+ *fsec = strtod( cp, NULL);
+ };
+ *(str+4) = '\0';
+ tm->tm_min = strtod( (str+2), &cp);
+ *(str+2) = '\0';
+ tm->tm_hour = strtod( (str+0), &cp);
+
+ } else {
+ return -1;
+ };
+
+ return 0;
+} /* DecodeNumberField() */
+
+
+/* DecodeTimezone()
+ * Interpret string as a numeric timezone.
+ */
+int DecodeTimezone( char *str, int *tzp)
+{
+ int tz;
+ int hr, min;
+ char *cp;
+ int len;
+
+ /* assume leading character is "+" or "-" */
+ hr = strtol( (str+1), &cp, 10);
+
+ /* explicit delimiter? */
+ if (*cp == ':') {
+ min = strtol( (cp+1), &cp, 10);
+
+ /* otherwise, might have run things together... */
+ } else if ((*cp == '\0') && ((len = strlen(str)) > 3)) {
+ min = strtol( (str+len-2), &cp, 10);
+ *(str+len-2) = '\0';
+ hr = strtol( (str+1), &cp, 10);
+
+ } else {
+ min = 0;
+ };
+
+ tz = (hr*60+min)*60;
+ if (*str == '-') tz = -tz;
+
+ *tzp = -tz;
+ return( *cp != '\0');
+} /* DecodeTimezone() */
+
+
+/* DecodeSpecial()
+ * Decode text string using lookup table.
+ * Implement a cache lookup since it is likely that dates
+ * will be related in format.
+ */
+int
+DecodeSpecial(int field, char *lowtoken, int *val)
+{
+ int type;
+ datetkn *tp;
+
+#if USE_DATE_CACHE
+ if ((datecache[field] != NULL)
+ && (strncmp(lowtoken,datecache[field]->token,TOKMAXLEN) == 0)) {
+ tp = datecache[field];
+ } else {
+#endif
+ tp = datebsearch(lowtoken, datetktbl, szdatetktbl);
+#if USE_DATE_CACHE
+ };
+ datecache[field] = tp;
+#endif
+ if (tp == NULL) {
+ type = IGNORE;
+ *val = 0;
+ } else {
+ type = tp->type;
+ if ((type == TZ) || (type == DTZ)) {
+ *val = FROMVAL(tp);
+ } else {
+ *val = tp->value;
+ };
+ };
+
+ return(type);
+} /* DecodeSpecial() */
+
+
+/* DecodeDateDelta()
+ * Interpret previously parsed fields for general time interval.
+ * Return 0 if decoded and -1 if problems.
+ *
+ * If code is changed to read fields from first to last,
+ * then use READ_FORWARD-bracketed code to allow sign
+ * to persist to subsequent unsigned fields.
+ */
+int
+DecodeDateDelta( char *field[], int ftype[], int nf, int *dtype, struct tm *tm, double *fsec)
+{
+ int is_before = FALSE;
+#if READ_FORWARD
+ int is_neg = FALSE;
+#endif
+
+ int fmask = 0, tmask, type;
+ int i, ii;
+ int flen, val;
+ char *cp;
+ double sec;
+
+ *dtype = DTK_DELTA;
+
+ type = DTK_SECOND;
+ tm->tm_year = 0;
+ tm->tm_mon = 0;
+ tm->tm_mday = 0;
+ tm->tm_hour = 0;
+ tm->tm_min = 0;
+ tm->tm_sec = 0;
+ *fsec = 0;
+
+ /* read through list forwards to pick up initial time fields, if any */
+ for (ii = 0; ii < nf; ii++) {
+#ifdef DATEDEBUG
+printf( "DecodeDateDelta- field[%d] is %s (type %d)\n", ii, field[ii], ftype[ii]);
+#endif
+ if (ftype[ii] == DTK_TIME) {
+ if (DecodeTime(field[ii], fmask, &tmask, tm, fsec) != 0) return -1;
+
+ } else {
+ break;
+ };
+ };
+
+ /* read through remaining list backwards to pick up units before values */
+ for (i = nf-1; i >= ii; i--) {
+#ifdef DATEDEBUG
+printf( "DecodeDateDelta- field[%d] is %s (type %d)\n", i, field[i], ftype[i]);
+#endif
+ switch (ftype[i]) {
+ case DTK_TIME:
+#if FALSE
+ if (DecodeTime(field[i], fmask, &tmask, tm, fsec) != 0) return -1;
+#endif
+ return -1;
+ break;
+
+ case DTK_TZ: /* timezone is a token with a leading sign character */
+#if READ_FORWARD
+ is_neg = (*field[i] == '-');
+#endif
+
+ case DTK_NUMBER:
+ val = strtol( field[i], &cp, 10);
+#if READ_FORWARD
+ if (is_neg && (val > 0)) val = -val;
+#endif
+ if (*cp == '.') {
+ *fsec = strtod( cp, NULL);
+ if (val < 0) *fsec = - (*fsec);
+ };
+ flen = strlen(field[i]);
+ tmask = DTK_M(type);
+
+ switch (type) {
+ case DTK_MICROSEC:
+ *fsec += (val * 1e-6);
+ break;
+
+ case DTK_MILLISEC:
+ *fsec += (val * 1e-3);
+ break;
+
+ case DTK_SECOND:
+ tm->tm_sec += val;
+ break;
+
+ case DTK_MINUTE:
+ tm->tm_min += val;
+ break;
+
+ case DTK_HOUR:
+ tm->tm_hour += val;
+ break;
+
+ case DTK_DAY:
+ tm->tm_mday += val;
+ break;
+
+ case DTK_WEEK:
+ tm->tm_mday += val*7;
+ break;
+
+ case DTK_MONTH:
+ tm->tm_mon += val;
+ break;
+
+ case DTK_YEAR:
+ tm->tm_year += val;
+ break;
+
+ case DTK_DECADE:
+ tm->tm_year += val*10;
+ break;
+
+ case DTK_CENTURY:
+ tm->tm_year += val*100;
+ break;
+
+ case DTK_MILLENIUM:
+ tm->tm_year += val*1000;
+ break;
+
+ default:
+ return -1;
+ };
+ break;
+
+ case DTK_STRING:
+ case DTK_SPECIAL:
+ type = DecodeUnits( i, field[i], &val);
+#ifdef DATEDEBUG
+printf( "DecodeDateDelta- special field[%d] %s type=%d value=%d\n", i, field[i], type, val);
+#endif
+ if (type == IGNORE) continue;
+
+ tmask = 0; /* DTK_M(type); */
+ switch (type) {
+ case UNITS:
+#ifdef DATEDEBUG
+printf( "DecodeDateDelta- UNITS field %s value is %d\n", field[i], val);
+#endif
+ type = val;
+ break;
+
+ case AGO:
+ is_before = TRUE;
+ type = val;
+ break;
+
+ case RESERV:
+ type = (DTK_DATE_M || DTK_TIME_M);
+ *dtype = val;
+ break;
+
+ default:
+ return -1;
+ };
+ break;
+
+ default:
+ return -1;
+ };
+
+#ifdef DATEDEBUG
+printf( "DecodeDateDelta- (%08x/%08x) field[%d] %s value is %d\n",
+ fmask, tmask, i, field[i], val);
+#endif
+
+ if (tmask & fmask) return -1;
+ fmask |= tmask;
+ };
+
+ if (*fsec != 0) {
+ *fsec = modf( *fsec, &sec);
+ tm->tm_sec += sec;
+ };
+
+ if (is_before) {
+ *fsec = -(*fsec);
+ tm->tm_sec = -(tm->tm_sec);
+ tm->tm_min = -(tm->tm_min);
+ tm->tm_hour = -(tm->tm_hour);
+ tm->tm_mday = -(tm->tm_mday);
+ tm->tm_mon = -(tm->tm_mon);
+ tm->tm_year = -(tm->tm_year);
+ };
+
+#ifdef DATEDEBUG
+printf( "DecodeDateDelta- mask %08x (%08x)", fmask, DTK_DATE_M);
+printf( " set y%04d m%02d d%02d", tm->tm_year, tm->tm_mon, tm->tm_mday);
+printf( " %02d:%02d:%02d\n", tm->tm_hour, tm->tm_min, tm->tm_sec);
+#endif
+
+ /* ensure that at least one time field has been found */
+ return((fmask != 0)? 0: -1);
+} /* DecodeDateDelta() */
+
+
+/* DecodeUnits()
+ * Decode text string using lookup table.
+ * This routine supports time interval decoding.
+ */
+int
+DecodeUnits(int field, char *lowtoken, int *val)
+{
+ int type;
+ datetkn *tp;
+
+#if USE_DATE_CACHE
+ if ((deltacache[field] != NULL)
+ && (strncmp(lowtoken,deltacache[field]->token,TOKMAXLEN) == 0)) {
+ tp = deltacache[field];
+ } else {
+#endif
+ tp = datebsearch(lowtoken, deltatktbl, szdeltatktbl);
+#if USE_DATE_CACHE
+ };
+ deltacache[field] = tp;
+#endif
+ if (tp == NULL) {
+ type = IGNORE;
+ *val = 0;
+ } else {
+ type = tp->type;
+ if ((type == TZ) || (type == DTZ)) {
+ *val = FROMVAL(tp);
+ } else {
+ *val = tp->value;
+ };
+ };
+
+ return(type);
+} /* DecodeUnits() */
+
+
+/*
+ * Binary search -- from Knuth (6.2.1) Algorithm B. Special case like this
+ * is WAY faster than the generic bsearch().
+ */
+datetkn *
+datebsearch(char *key, datetkn *base, unsigned int nel)
+{
+ register datetkn *last = base + nel - 1, *position;
+ register int result;
+
+ while (last >= base) {
+ position = base + ((last - base) >> 1);
+ result = key[0] - position->token[0];
+ if (result == 0) {
+ result = strncmp(key, position->token, TOKMAXLEN);
+ if (result == 0)
+ return position;
+ }
+ if (result < 0)
+ last = position - 1;
+ else
+ base = position + 1;
+ }
+ return NULL;
+}
+
+
+/***************************************************************************/
+/***************************************************************************/
+/***************************************************************************/
+
+#if FALSE
+#ifndef PALLOCTYPE
+#define PALLOCTYPE(p) palloc(sizeof(p))
+#endif
+#endif
+
+char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", NULL};
+
+char *days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
+ "Thursday", "Friday", "Saturday", NULL};
+
+#if FALSE
+int EncodeMonth(int mon, char *str);
+
+int EncodeMonth(int mon, char *str)
+{
+ strcpy( str, months[mon-1]);
+
+ return(TRUE);
+} /* EncodeMonth() */
+#endif
+
+#define EncodeMonth(m,s) strcpy(s,months[m-1])
+
+
+int EncodeSpecialDateTime(DateTime *dt, char *str)
+{
+ if (DATETIME_IS_RESERVED(dt)) {
+ if (DATETIME_IS_INVALID(dt)) {
+ strcpy( str, INVALID);
+
+ } else if (DATETIME_IS_NOBEGIN(dt)) {
+ strcpy( str, EARLY);
+
+ } else if (DATETIME_IS_NOEND(dt)) {
+ strcpy( str, LATE);
+
+ } else if (DATETIME_IS_CURRENT(dt)) {
+ strcpy( str, DCURRENT);
+
+ } else if (DATETIME_IS_EPOCH(dt)) {
+ strcpy( str, EPOCH);
+
+ } else {
+#ifdef DATEDEBUG
+printf( "EncodeSpecialDateTime- unrecognized date\n");
+#endif
+ strcpy( str, INVALID);
+ };
+ return(TRUE);
+ };
+
+ return(FALSE);
+} /* EncodeSpecialDateTime() */
+
+
+int EncodePostgresDate(struct tm *tm, double fsec, char *str)
+{
+ char mabbrev[4], dabbrev[4];
+ int day;
+ double sec;
+ char buf[MAXDATELEN];
+
+ sec = (tm->tm_sec + fsec);
+
+ tm->tm_isdst = -1;
+
+#ifdef DATEDEBUG
+printf( "EncodePostgresDate- timezone is %s/%s; offset is %ld; daylight is %d\n",
+ tzname[0], tzname[1], timezone, daylight);
+#endif
+
+ day = date2j( tm->tm_year, tm->tm_mon, tm->tm_mday);
+#ifdef DATEDEBUG
+printf( "EncodePostgresDate- day is %d\n", day);
+#endif
+ tm->tm_wday = j2day( day);
+
+ strncpy( dabbrev, days[tm->tm_wday], 3);
+ dabbrev[3] = '\0';
+
+ if ((tm->tm_mon < 1) || (tm->tm_mon > 12))
+ return -1;
+
+ strcpy( mabbrev, months[tm->tm_mon-1]);
+
+ if (EuroDates) {
+ sprintf( str, "%3s %02d/%02d/%04d %02d:%02d:%02d %s", dabbrev,
+ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_hour, tm->tm_min, (int) rint(sec), tzname[0]);
+
+ } else if (tm->tm_year > 0) {
+#if FALSE
+ sprintf( str, "%3s %3s %02d %02d:%02d:%02d %04d %s", dabbrev,
+ mabbrev, tm->tm_mday, tm->tm_hour, tm->tm_min, (int) rint(sec), tm->tm_year, tzname[0]);
+#endif
+ sprintf( str, "%3s %3s %02d %02d:%02d:%5.2f %04d %s", dabbrev,
+ mabbrev, tm->tm_mday, tm->tm_hour, tm->tm_min, sec, tm->tm_year, tzname[0]);
+ /* XXX brute-force fill in leading zero on seconds */
+ if (*(str+17) == ' ') *(str+17) = '0';
+
+ } else {
+ sprintf( str, "%3s %3s %02d %02d:%02d:%02d %04d %s", dabbrev,
+ mabbrev, tm->tm_mday, tm->tm_hour, tm->tm_min, (int) rint(sec), -(tm->tm_year-1), "BC");
+ };
+#ifdef DATEDEBUG
+printf( "EncodePostgresDate- date result is %s\n", str);
+#endif
+
+ if (tm->tm_year >= 1000) tm->tm_year -= 1900;
+ tm->tm_mon -= 1;
+ strftime( buf, sizeof(buf), "%y.%m.%d %H:%M:%S %Z", tm);
+#if FALSE
+ time = mktime( tm);
+ strftime( buf, sizeof(buf), "%y.%m.%d %H:%M:%S %Z", localtime(&time));
+ strcpy( str, buf);
+#endif
+#ifdef DATEDEBUG
+printf( "EncodePostgresDate- strftime result is %s\n", buf);
+#endif
+
+ return(TRUE);
+} /* EncodePostgresDate() */
+
+
+int EncodePostgresSpan(struct tm *tm, double fsec, char *str)
+{
+ int is_before = FALSE;
+ int is_nonzero = FALSE;
+ char *cp;
+
+ strcpy( str, "@");
+ cp = str+strlen(str);
+ if (tm->tm_year != 0) {
+ is_nonzero = TRUE;
+ is_before |= (tm->tm_year < 0);
+ sprintf( cp, " %d year%s", abs(tm->tm_year), ((abs(tm->tm_year) != 1)? "s": ""));
+ cp += strlen(cp);
+ };
+ if (tm->tm_mon != 0) {
+ is_nonzero = TRUE;
+ is_before |= (tm->tm_mon < 0);
+ sprintf( cp, " %d mon%s", abs(tm->tm_mon), ((abs(tm->tm_mon) != 1)? "s": ""));
+ cp += strlen(cp);
+ };
+ if (tm->tm_mday != 0) {
+ is_nonzero = TRUE;
+ is_before |= (tm->tm_mday < 0);
+ sprintf( cp, " %d day%s", abs(tm->tm_mday), ((abs(tm->tm_mday) != 1)? "s": ""));
+ cp += strlen(cp);
+ };
+ if (tm->tm_hour != 0) {
+ is_nonzero = TRUE;
+ is_before |= (tm->tm_hour < 0);
+ sprintf( cp, " %d hour%s", abs(tm->tm_hour), ((abs(tm->tm_hour) != 1)? "s": ""));
+ cp += strlen(cp);
+ };
+ if (tm->tm_min != 0) {
+ is_nonzero = TRUE;
+ is_before |= (tm->tm_min < 0);
+ sprintf( cp, " %d min%s", abs(tm->tm_min), ((abs(tm->tm_min) != 1)? "s": ""));
+ cp += strlen(cp);
+ };
+ if (tm->tm_sec != 0) {
+ is_nonzero = TRUE;
+ is_before |= (tm->tm_sec < 0);
+ sprintf( cp, " %d sec%s", abs(tm->tm_sec), ((abs(tm->tm_sec) != 1)? "s": ""));
+ cp += strlen(cp);
+ };
+
+ if (! is_nonzero) {
+ strcat( cp, " 0");
+ cp += strlen(cp);
+ };
+
+ if (is_before) {
+ strcat( cp, " ago");
+ cp += strlen(cp);
+ };
+
+#ifdef DATEDEBUG
+printf( "EncodePostgresSpan- result is %s\n", str);
+#endif
+
+ return 0;
+} /* EncodePostgresSpan() */
+
+
+#if FALSE
+/*----------------------------------------------------------
+ * Relational operators for JDATEs.
+ *---------------------------------------------------------*/
+
+#define JDATElt(a,b) (((a).date < (b).date) || (((a).date == (b).date) && ((a).time < (b).time)))
+#define JDATEle(a,b) (((a).date < (b).date) || (((a).date == (b).date) && ((a).time <= (b).time)))
+#define JDATEeq(a,b) (((a).date == (b).date) && ((a).time == (b).time))
+#define JDATEge(a,b) (((a).date > (b).date) || (((a).date == (b).date) && ((a).time >= (b).time)))
+#define JDATEgt(a,b) (((a).date > (b).date) || (((a).date == (b).date) && ((a).time > (b).time)))
+
+/* jintervals identical?
+ */
+bool jinterval_same(JINTERVAL *jinterval1, JINTERVAL *jinterval2)
+{
+ return( JDATEeq(jinterval1->bdate,jinterval2->bdate)
+ && JDATEeq(jinterval1->edate,jinterval2->edate));
+}
+
+/* jinterval_overlap - does jinterval1 overlap jinterval2?
+ */
+bool jinterval_overlap(JINTERVAL *jinterval1, JINTERVAL *jinterval2)
+{
+ return( JDATEle(jinterval1->bdate,jinterval2->edate)
+ && JDATEge(jinterval1->edate,jinterval2->bdate));
+}
+
+/* jinterval_overleft - is the right edge of jinterval1 to the left of
+ * the right edge of jinterval2?
+ */
+bool jinterval_overleft(JINTERVAL *jinterval1, JINTERVAL *jinterval2)
+{
+ return( JDATEle(jinterval1->edate,jinterval2->edate));
+}
+
+/* jinterval_left - is jinterval1 strictly left of jinterval2?
+ */
+bool jinterval_left(JINTERVAL *jinterval1, JINTERVAL *jinterval2)
+{
+ return( JDATEle(jinterval1->edate,jinterval2->bdate));
+}
+
+/* jinterval_right - is jinterval1 strictly right of jinterval2?
+ */
+bool jinterval_right(JINTERVAL *jinterval1, JINTERVAL *jinterval2)
+{
+ return( JDATEge(jinterval1->edate,jinterval2->bdate));
+}
+
+/* jinterval_overright - is the left edge of jinterval1 to the right of
+ * the left edge of jinterval2?
+ */
+bool jinterval_overright(JINTERVAL *jinterval1, JINTERVAL *jinterval2)
+{
+ return( JDATEge(jinterval1->bdate,jinterval2->bdate));
+}
+
+/* jinterval_contained - is jinterval1 contained by jinterval2?
+ */
+bool jinterval_contained(JINTERVAL *jinterval1, JINTERVAL *jinterval2)
+{
+ return( JDATEge(jinterval1->bdate,jinterval2->bdate)
+ && JDATEle(jinterval1->edate,jinterval2->edate));
+}
+
+/* jinterval_contain - does jinterval1 contain jinterval2?
+ */
+bool jinterval_contain(JINTERVAL *jinterval1, JINTERVAL *jinterval2)
+{
+ return( JDATEle(jinterval1->bdate,jinterval2->bdate)
+ && JDATEge(jinterval1->edate,jinterval2->edate));
+}
+
+
+/* jdate_relop - is jdate1 relop jdate2
+ */
+bool jdate_lt(JDATE *jdate1, JDATE *jdate2)
+{
+ return( JDATElt(*jdate1,*jdate2));
+}
+
+bool jdate_gt(JDATE *jdate1, JDATE *jdate2)
+{
+ return( JDATEgt(*jdate1,*jdate2));
+}
+
+bool jdate_eq(JDATE *jdate1, JDATE *jdate2)
+{
+ return( JDATEeq(*jdate1,*jdate2));
+}
+
+bool jdate_le(JDATE *jdate1, JDATE *jdate2)
+{
+ return( JDATEle(*jdate1,*jdate2));
+}
+
+bool jdate_ge(JDATE *jdate1, JDATE *jdate2)
+{
+ return( JDATEge(*jdate1,*jdate2));
+}
+#endif
+
+
+/*----------------------------------------------------------
+ * "Arithmetic" operators on date/times.
+ * datetime_foo returns foo as an object (pointer) that
+ can be passed between languages.
+ * datetime_xx is an internal routine which returns the
+ * actual value.
+ *---------------------------------------------------------*/
+
+/*----------------------------------------------------------
+ * Conversion operators.
+ *---------------------------------------------------------*/
+
+TimeSpan *datetime_sub(DateTime *dt1, DateTime *dt2)
+{
+ TimeSpan *result;
+
+ if ((!PointerIsValid(dt1)) || (!PointerIsValid(dt2)))
+ return NULL;
+
+ if (!PointerIsValid(result = PALLOCTYPE(TimeSpan)))
+ elog(WARN, "Memory allocation failed, can't subtract dates",NULL);
+
+#if USE_JULIAN_DAY
+ result->time = ((*dt1 - *dt2)*86400);
+ result->month = 0;
+#else
+ result->time = JROUND(*dt1 - *dt2);
+ result->month = 0;
+#endif
+
+ return(result);
+} /* datetime_sub() */
+
+
+DateTime *datetime_add_span(DateTime *dt, TimeSpan *span)
+{
+ DateTime *result;
+ double date, time;
+ int year, mon, mday;
+
+ if ((!PointerIsValid(dt)) || (!PointerIsValid(span)))
+ return NULL;
+
+ if (!PointerIsValid(result = PALLOCTYPE(DateTime)))
+ elog(WARN, "Memory allocation failed, can't add dates",NULL);
+
+#ifdef DATEDEBUG
+printf( "date_add- add %f to %d %f\n", *dt, span->month, span->time);
+#endif
+
+ if (span->month != 0) {
+#if USE_JULIAN_DAY
+ time = modf( *dt, &date);
+#else
+ time = JROUND(modf( (*dt/86400), &date)*86400);
+ date += date2j(2000,1,1);
+#endif
+ j2date( ((int) date), &year, &mon, &mday);
+ mon += span->month;
+ if (mon > 12) {
+ year += mon / 12;
+ mon %= 12;
+ };
+#if USE_JULIAN_DAY
+ *result = date2j( year, mon, mday);
+#else
+ *result = ((date2j( year, mon, mday)-date2j(2000,1,1))*86400);
+#endif
+ *result += time;
+ } else {
+ *result = *dt;
+ };
+
+#if USE_JULIAN_DAY
+ *result += (span->time/86400);
+#else
+ *result = JROUND(*result + span->time);
+#endif
+
+ return(result);
+} /* datetime_add_span() */
+
+DateTime *datetime_sub_span(DateTime *dt, TimeSpan *span)
+{
+ DateTime *result;
+ TimeSpan tspan;
+
+ if ((!PointerIsValid(dt)) || (!PointerIsValid(span)))
+ return NULL;
+
+ tspan.month = -span->month;
+ tspan.time = -span->time;
+
+ result = datetime_add_span( dt, &tspan);
+
+ return(result);
+} /* datetime_sub_span() */
+
+
+/***********************************************************************
+ **
+ ** Routines for time spans.
+ **
+ ***********************************************************************/
+
+/*----------------------------------------------------------
+ * Formatting and conversion routines.
+ *---------------------------------------------------------*/
+
+/*----------------------------------------------------------
+ * "Arithmetic" operators on date/times.
+ * datetime_foo returns foo as an object (pointer) that
+ can be passed between languages.
+ * datetime_xx is an internal routine which returns the
+ * actual value.
+ *---------------------------------------------------------*/
+
+/*----------------------------------------------------------
+ * Conversion operators.
+ *---------------------------------------------------------*/
+
+TimeSpan *timespan_add(TimeSpan *span1, TimeSpan *span2)
+{
+ TimeSpan *result;
+
+ if ((!PointerIsValid(span1)) || (!PointerIsValid(span2)))
+ return NULL;
+
+ if (!PointerIsValid(result = PALLOCTYPE(TimeSpan)))
+ elog(WARN, "Memory allocation failed, can't add timespans",NULL);
+
+ result->month = (span1->month + span2->month);
+ result->time = JROUND(span1->time + span2->time);
+
+ return(result);
+} /* timespan_add() */
+
+TimeSpan *timespan_sub(TimeSpan *span1, TimeSpan *span2)
+{
+ TimeSpan *result;
+
+ if ((!PointerIsValid(span1)) || (!PointerIsValid(span2)))
+ return NULL;
+
+ if (!PointerIsValid(result = PALLOCTYPE(TimeSpan)))
+ elog(WARN, "Memory allocation failed, can't subtract timespans",NULL);
+
+ result->month = (span1->month - span2->month);
+ result->time = JROUND(span1->time - span2->time);
+
+ return(result);
+} /* timespan_sub() */