* contrib/hbxbp/hbxbp.hbc
+ Added gtgui as default GT on win/wce systems.
* include/extend.api
* include/hbsetup.ch
* include/hbapi.h
+ Added new HB_LEGACY_LEVEL3 macro to wrap legacy
constructs to be deprecated in the next major release.
Currently legacy IS*() parameter type checking macros
are marked as such, ones present in CA-Cl*pper retained
in extend.api even when this macro off.
; NOTE: It's recommended for 3rd party developers to
start using new HB_IS*() macros. They work
the same as Clipper compatible IS*() macros,
but got a HB_ prefix: ISNUM( 1 ) -> HB_ISNUM( 1 )
(not to be confused with HB_IS_*() macros which
accept a PHB_ITEM)
Here's a little batch which helps this process:
---
gsar -o -s:x20ISNUM( -r:x20HB_ISNUM( *.c *.cpp
gsar -o -s:x20ISCHAR( -r:x20HB_ISCHAR( *.c *.cpp
gsar -o -s:x20ISLOG( -r:x20HB_ISLOG( *.c *.cpp
gsar -o -s:x20ISARRAY( -r:x20HB_ISARRAY( *.c *.cpp
gsar -o -s:x20ISBYREF( -r:x20HB_ISBYREF( *.c *.cpp
gsar -o -s:x20ISDATE( -r:x20HB_ISDATE( *.c *.cpp
gsar -o -s:x20ISDATETIME( -r:x20HB_ISDATETIME( *.c *.cpp
gsar -o -s:x20ISNIL( -r:x20HB_ISNIL( *.c *.cpp
gsar -o -s:x20ISTIMESTAMP( -r:x20HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s:x20ISBLOCK( -r:x20HB_ISBLOCK( *.c *.cpp
gsar -o -s:x20ISPOINTER( -r:x20HB_ISPOINTER( *.c *.cpp
gsar -o -s:x20ISSYMBOL( -r:x20HB_ISSYMBOL( *.c *.cpp
gsar -o -s:x20ISOBJECT( -r:x20HB_ISOBJECT( *.c *.cpp
gsar -o -s:x20ISHASH( -r:x20HB_ISHASH( *.c *.cpp
gsar -o -s!ISNUM( -r!HB_ISNUM( *.c *.cpp
gsar -o -s!ISCHAR( -r!HB_ISCHAR( *.c *.cpp
gsar -o -s!ISLOG( -r!HB_ISLOG( *.c *.cpp
gsar -o -s!ISARRAY( -r!HB_ISARRAY( *.c *.cpp
gsar -o -s!ISBYREF( -r!HB_ISBYREF( *.c *.cpp
gsar -o -s!ISDATE( -r!HB_ISDATE( *.c *.cpp
gsar -o -s!ISDATETIME( -r!HB_ISDATETIME( *.c *.cpp
gsar -o -s!ISNIL( -r!HB_ISNIL( *.c *.cpp
gsar -o -s!ISTIMESTAMP( -r!HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s!ISBLOCK( -r!HB_ISBLOCK( *.c *.cpp
gsar -o -s!ISPOINTER( -r!HB_ISPOINTER( *.c *.cpp
gsar -o -s!ISSYMBOL( -r!HB_ISSYMBOL( *.c *.cpp
gsar -o -s!ISOBJECT( -r!HB_ISOBJECT( *.c *.cpp
gsar -o -s!ISHASH( -r!HB_ISHASH( *.c *.cpp
---
* source/rtl/hbinet.c
* Formatting.
% Minor optimizations.
* source/debug/dbgentry.c
* source/rdd/dbcmd.c
* source/rdd/dbcmd53.c
* source/rdd/dbcmdx.c
* source/rdd/dbdetach.c
* source/rdd/dbsql.c
* source/rdd/hbsix/sxfname.c
* source/rdd/hbsix/sxord.c
* source/rdd/hbsix/sxtable.c
* source/rdd/usrrdd/usrrdd.c
* source/rtl/at.c
* source/rtl/box.c
* source/rtl/cdpapi.c
* source/rtl/chrasc.c
* source/rtl/colorind.c
* source/rtl/console.c
* source/rtl/copyfile.c
* source/rtl/dateshb.c
* source/rtl/dirdrive.c
* source/rtl/diskspac.c
* source/rtl/disksphb.c
* source/rtl/errapi.c
* source/rtl/filesys.c
* source/rtl/fscopy.c
* source/rtl/fssize.c
* source/rtl/fstemp.c
* source/rtl/gete.c
* source/rtl/gtfunc.c
* source/rtl/gx.c
* source/rtl/hbbit.c
* source/rtl/hbgtcore.c
* source/rtl/hbhex.c
* source/rtl/hbi18n1.c
* source/rtl/hbinet.c
* source/rtl/hbprocfn.c
* source/rtl/hbrandom.c
* source/rtl/hbregex.c
* source/rtl/hbstrsh.c
* source/rtl/hbtoken.c
* source/rtl/hbzlib.c
* source/rtl/hbzlibgz.c
* source/rtl/inkey.c
* source/rtl/itemseri.c
* source/rtl/left.c
* source/rtl/math.c
* source/rtl/maxrow.c
* source/rtl/mlcfunc.c
* source/rtl/mouse53.c
* source/rtl/mousex.c
* source/rtl/mtran.c
* source/rtl/natmsg.c
* source/rtl/padc.c
* source/rtl/padl.c
* source/rtl/padr.c
* source/rtl/philes.c
* source/rtl/philes53.c
* source/rtl/rat.c
* source/rtl/replic.c
* source/rtl/right.c
* source/rtl/round.c
* source/rtl/run.c
* source/rtl/saverest.c
* source/rtl/scroll.c
* source/rtl/setcolor.c
* source/rtl/setcurs.c
* source/rtl/setpos.c
* source/rtl/shadow.c
* source/rtl/strc.c
* source/rtl/strmatch.c
* source/rtl/strpeek.c
* source/rtl/strtoexp.c
* source/rtl/strtran.c
* source/rtl/stuff.c
* source/rtl/substr.c
* source/rtl/tone.c
* source/rtl/trace.c
* source/rtl/transfrm.c
* source/rtl/valtype.c
* source/rtl/word.c
* source/vm/arrayshb.c
* source/vm/asort.c
* source/vm/classes.c
* source/vm/cmdarg.c
* source/vm/eval.c
* source/vm/hashfunc.c
* source/vm/hvm.c
* source/vm/memvars.c
* source/vm/proc.c
* source/vm/thread.c
* IS*() -> HB_IS*() macro rename.
(pass 1 - sf.net SVN works badly today, so I've split
the commit to raise the chances of a successfully
finished one)
430 lines
10 KiB
C
430 lines
10 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* The Date API (Harbour level)
|
|
*
|
|
* Copyright 1999 Antonio Linares <alinares@fivetech.com>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* The following parts are Copyright of the individual authors.
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* Copyright 1999 Jose Lalin <dezac@corevia.com>
|
|
* DAY()
|
|
* MONTH()
|
|
* YEAR()
|
|
* DOW()
|
|
*
|
|
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
|
|
* CTOD()
|
|
* DATE()
|
|
*
|
|
* Copyright 1999-2001 Viktor Szakats (harbour.01 syenar.hu)
|
|
* HB_STOD()
|
|
*
|
|
* See COPYING for licensing terms.
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapierr.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbset.h"
|
|
#include "hbdate.h"
|
|
|
|
HB_FUNC( CTOD )
|
|
{
|
|
if( HB_ISCHAR( 1 ) )
|
|
hb_retdl( hb_dateUnformat( hb_parc( 1 ), hb_setGetDateFormat() ) );
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1119, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_CTOD )
|
|
{
|
|
if( HB_ISCHAR( 1 ) )
|
|
{
|
|
const char * szFormat = hb_parc( 2 );
|
|
|
|
if( ! szFormat )
|
|
szFormat = hb_setGetDateFormat();
|
|
hb_retdl( hb_dateUnformat( hb_parc( 1 ), szFormat ) );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1119, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( DTOC )
|
|
{
|
|
if( HB_ISDATETIME( 1 ) )
|
|
{
|
|
char szDate[ 9 ];
|
|
char szFormatted[ 11 ];
|
|
|
|
hb_retc( hb_dateFormat( hb_pardsbuff( szDate, 1 ), szFormatted, hb_setGetDateFormat() ) );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1118, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_DTOC )
|
|
{
|
|
if( HB_ISDATETIME( 1 ) )
|
|
{
|
|
char szDate[ 9 ];
|
|
char szFormatted[ 11 ];
|
|
const char * szFormat = hb_parc( 2 );
|
|
|
|
if( ! szFormat )
|
|
szFormat = hb_setGetDateFormat();
|
|
hb_retc( hb_dateFormat( hb_pardsbuff( szDate, 1 ), szFormatted, szFormat ) );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1118, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( DTOS )
|
|
{
|
|
if( HB_ISDATETIME( 1 ) )
|
|
{
|
|
char szDate[ 9 ];
|
|
|
|
hb_retc( hb_pardsbuff( szDate, 1 ) );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1120, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
/* NOTE: Harbour extension, exactly the same as STOD(). */
|
|
|
|
HB_FUNC( HB_STOD )
|
|
{
|
|
PHB_ITEM pDateString = hb_param( 1, HB_IT_STRING );
|
|
|
|
hb_retds( hb_itemGetCLen( pDateString ) >= 7 ? hb_itemGetCPtr( pDateString ) : NULL );
|
|
}
|
|
|
|
HB_FUNC( YEAR )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATETIME );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
|
|
hb_retnilen( iYear, 5 );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1112, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( MONTH )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATETIME );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
|
|
hb_retnilen( iMonth, 3 );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1113, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( DAY )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATETIME );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
|
|
hb_retnilen( iDay, 3 );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1114, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( TIME )
|
|
{
|
|
char szResult[ 9 ];
|
|
hb_dateTimeStr( szResult );
|
|
hb_retclen( szResult, 8 );
|
|
}
|
|
|
|
HB_FUNC( DATE )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
hb_dateToday( &iYear, &iMonth, &iDay );
|
|
hb_retd( iYear, iMonth, iDay );
|
|
}
|
|
|
|
HB_FUNC( DOW )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATETIME );
|
|
|
|
if( pDate )
|
|
hb_retnilen( hb_dateJulianDOW( hb_itemGetDL( pDate ) ), 3 );
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1115, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_DATETIME )
|
|
{
|
|
long lDate, lTime;
|
|
|
|
hb_timeStampGet( &lDate, &lTime );
|
|
hb_rettdt( lDate, lTime );
|
|
}
|
|
|
|
HB_FUNC( HB_NTOT )
|
|
{
|
|
PHB_ITEM pNum = hb_param( 1, HB_IT_NUMERIC );
|
|
|
|
if( pNum )
|
|
hb_rettd( hb_itemGetND( pNum ) );
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_TTON )
|
|
{
|
|
PHB_ITEM pTime = hb_param( 1, HB_IT_DATETIME );
|
|
|
|
if( pTime )
|
|
hb_retnd( hb_itemGetTD( pTime ) );
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_TTOC )
|
|
{
|
|
long lDate, lTime;
|
|
|
|
if( hb_partdt( &lDate, &lTime, 1 ) )
|
|
{
|
|
const char * szDateFormat = hb_parc( 2 );
|
|
const char * szTimeFormat = hb_parc( 3 );
|
|
char szBuffer[ 27 ];
|
|
|
|
if( ! szDateFormat )
|
|
szDateFormat = hb_setGetDateFormat();
|
|
if( ! szTimeFormat )
|
|
szTimeFormat = hb_setGetTimeFormat();
|
|
|
|
hb_retc( hb_timeStampFormat( szBuffer, szDateFormat, szTimeFormat,
|
|
lDate, lTime ) );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_CTOT )
|
|
{
|
|
const char * szDateTime = hb_parc( 1 );
|
|
|
|
if( szDateTime )
|
|
{
|
|
long lDate, lTime;
|
|
const char * szDateFormat = hb_parc( 2 );
|
|
const char * szTimeFormat = hb_parc( 3 );
|
|
|
|
if( ! szDateFormat )
|
|
szDateFormat = hb_setGetDateFormat();
|
|
if( ! szTimeFormat )
|
|
szTimeFormat = hb_setGetTimeFormat();
|
|
|
|
hb_timeStampUnformat( szDateTime, szDateFormat, szTimeFormat, &lDate, &lTime );
|
|
hb_rettdt( lDate, lTime );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_TTOS )
|
|
{
|
|
long lDate, lTime;
|
|
|
|
if( hb_partdt( &lDate, &lTime, 1 ) )
|
|
{
|
|
char szBuffer[ 18 ];
|
|
|
|
hb_retc( hb_timeStampStrRawPut( szBuffer, lDate, lTime ) );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_STOT )
|
|
{
|
|
const char * szDateTime = hb_parc( 1 );
|
|
|
|
if( szDateTime )
|
|
{
|
|
long lDate, lTime;
|
|
|
|
hb_timeStampStrRawGet( szDateTime, &lDate, &lTime );
|
|
hb_rettdt( lDate, lTime );
|
|
}
|
|
else
|
|
hb_rettdt( 0, 0 );
|
|
}
|
|
|
|
HB_FUNC( HB_HOUR )
|
|
{
|
|
long lDate, lTime;
|
|
|
|
if( hb_partdt( &lDate, &lTime, 1 ) )
|
|
{
|
|
int iHour, iMinutes, iSeconds, iMSec;
|
|
|
|
hb_timeDecode( lTime, &iHour, &iMinutes, &iSeconds, &iMSec );
|
|
hb_retnilen( iHour, 3 );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_MINUTE )
|
|
{
|
|
long lDate, lTime;
|
|
|
|
if( hb_partdt( &lDate, &lTime, 1 ) )
|
|
{
|
|
int iHour, iMinutes, iSeconds, iMSec;
|
|
|
|
hb_timeDecode( lTime, &iHour, &iMinutes, &iSeconds, &iMSec );
|
|
hb_retnilen( iMinutes, 3 );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_SEC )
|
|
{
|
|
long lDate, lTime;
|
|
|
|
if( hb_partdt( &lDate, &lTime, 1 ) )
|
|
{
|
|
int iHour, iMinutes, iSeconds, iMSec;
|
|
|
|
hb_timeDecode( lTime, &iHour, &iMinutes, &iSeconds, &iMSec );
|
|
hb_retndlen( ( double ) ( iSeconds * 1000 + iMSec ) / 1000, 3, 3 );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_TSTOSTR )
|
|
{
|
|
long lDate, lTime;
|
|
|
|
if( hb_partdt( &lDate, &lTime, 1 ) )
|
|
{
|
|
char szBuffer[ 24 ];
|
|
|
|
hb_timeStampStr( szBuffer, lDate, lTime );
|
|
if( HB_ISLOG( 2 ) && hb_parl( 2 ) )
|
|
{
|
|
if( lTime == 0 )
|
|
{
|
|
if( lDate == 0 )
|
|
hb_retc( "00:00" );
|
|
else
|
|
{
|
|
szBuffer[ 10 ] = '\0';
|
|
hb_retc( szBuffer );
|
|
}
|
|
}
|
|
else
|
|
{
|
|
int i = 23;
|
|
while( szBuffer[ i - 1 ] == '0' )
|
|
--i;
|
|
if( szBuffer[ i - 1 ] == '.' )
|
|
{
|
|
--i;
|
|
if( szBuffer[ i - 1 ] == '0' && szBuffer[ i - 2 ] == '0' )
|
|
i -= 3;
|
|
}
|
|
szBuffer[ i ] = '\0';
|
|
if( lDate == 0 )
|
|
hb_retc( szBuffer + 11 );
|
|
else
|
|
hb_retc( szBuffer );
|
|
}
|
|
}
|
|
else
|
|
hb_retc( szBuffer );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_STRTOTS )
|
|
{
|
|
const char * szDateTime = hb_parc( 1 );
|
|
|
|
if( szDateTime )
|
|
{
|
|
long lDate, lTime;
|
|
|
|
hb_timeStampStrGetDT( szDateTime, &lDate, &lTime );
|
|
hb_rettdt( lDate, lTime );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|