* include/hbdefs.h
+ Added HB_ISALNUM() macro.
+ Added HB_ISSPACE() macro. Please review.
* source/contrib/hbver.c
* isspace() -> HB_ISSPACE().
* contrib/rddads/ads1.c
! toupper() -> HB_TOUPPER()
* contrib/xhb/hbxml.c
+ Readded #include <ctype.h> because this one still uses isspace().
* include/hbcomp.h
* include/hbmacro.h
* contrib/hbct/token1.c
* contrib/hbodbc/odbc.c
* contrib/xhb/freadlin.c
* contrib/rddsql/sqlmix.c
* contrib/gtwvg/gtwvg.h
* contrib/gtwvg/wvggui.h
* contrib/rddads/adsx.c
* contrib/rddads/ads1.c
* contrib/hbclipsm/time.c
* contrib/hbclipsm/status.c
* contrib/hbmisc/dates2.c
* contrib/hbwin/win_ole.c
* contrib/examples/pp/pp.c
* source/debug/dbgentry.c
* source/common/hbver.c
* source/rtl/chrasc.c
* source/rtl/philes.c
* source/rtl/dirdrive.c
* source/rtl/dateshb.c
* source/rtl/philesx.c
* source/rtl/disksphb.c
* source/rtl/soundex.c
* source/rtl/gtapi.c
* source/rtl/filesys.c
* source/codepage/cppt850.c
* source/codepage/cpuawin.c
* source/codepage/cpde850.c
* source/codepage/cpsv850.c
* source/codepage/cpeswinc.c
* source/codepage/cptr857.c
* source/codepage/cpru866.c
* source/codepage/cproiso.c
* source/codepage/cprowin.c
* source/codepage/cpeswinm.c
* source/codepage/cpes850.c
* source/codepage/cpcs852.c
* source/codepage/cpitisb.c
* source/codepage/cphu852.c
* source/codepage/cpsk852.c
* source/codepage/cpplmaz.c
* source/codepage/cpesisoc.c
* source/codepage/cppliso.c
* source/codepage/cpbgmik.c
* source/codepage/cpplwin.c
* source/codepage/cpbg866.c
* source/codepage/cpltwin.c
* source/codepage/cphu852s.c
* source/codepage/cpptiso.c
* source/codepage/cpel737.c
* source/codepage/cpsrwin.c
* source/codepage/cpsviso.c
* source/codepage/cpdeiso.c
* source/codepage/cpfr850.c
* source/codepage/cpsvwin.c
* source/codepage/cpdewin.c
* source/codepage/cphr437.c
* source/codepage/cpes850c.c
* source/codepage/cphr852.c
* source/codepage/cpua866.c
* source/codepage/cpit850.c
* source/codepage/cpit437.c
* source/codepage/cpsl437.c
* source/codepage/cpsl852.c
* source/codepage/cphuwins.c
* source/codepage/cpcsiso.c
* source/codepage/cpesiso.c
* source/codepage/cpcswin.c
* source/codepage/cpeswin.c
* source/codepage/cphuiso.c
* source/codepage/cpskiso.c
* source/codepage/cprukoi.c
* source/codepage/cphuwin.c
* source/codepage/cpskwin.c
* source/codepage/cp_tpl.c
* source/codepage/cpruiso.c
* source/codepage/cpruwin.c
* source/codepage/cphuisos.c
* source/codepage/cpelwin.c
* source/codepage/cpro852.c
* source/codepage/cpfriso.c
* source/codepage/cpfrwin.c
* source/codepage/cpitiso.c
* source/codepage/cphrwin.c
* source/codepage/cpsliso.c
* source/codepage/cpitwin.c
* source/codepage/cpslwin.c
* source/codepage/cpcskam.c
* source/codepage/cpsvclip.c
* source/codepage/cpbgiso.c
* source/codepage/cptrwin.c
* source/codepage/cpskkam.c
* source/codepage/cpbgwin.c
* source/codepage/cpuakoi.c
* source/codepage/cppl852.c
* utils/hbdoc/hbdfrdln.c
* utils/hbmake/hbmfrdln.c
% Removed #include <ctype.h>. Most of these didn't need it anyway.
313 lines
7.3 KiB
C
313 lines
7.3 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Additional date functions
|
|
*
|
|
* Copyright 1999 Jose Lalin <dezac@corevia.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 Jon Berg <jmberg@pnh10.med.navy.mil>
|
|
* DateTime()
|
|
*
|
|
* See doc/license.txt for licensing terms.
|
|
*
|
|
*/
|
|
|
|
#include <time.h>
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbapilng.h"
|
|
#include "hbdate.h"
|
|
|
|
static int s_daysinmonth[ 12 ] =
|
|
{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
|
|
|
|
BOOL hb_isleapyear( int iYear )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_isleapyear(%d)", iYear));
|
|
|
|
return ( iYear % 4 == 0 && iYear % 100 != 0 ) || ( iYear % 400 == 0 );
|
|
}
|
|
|
|
int hb_daysinmonth( int iYear, int iMonth )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_daysinmonth(%d, %d)", iYear, iMonth));
|
|
|
|
if( iMonth > 0 && iMonth < 13 )
|
|
return s_daysinmonth[ iMonth - 1 ] +
|
|
( ( iMonth == 2 && hb_isleapyear( iYear ) ) ? 1 : 0 );
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
int hb_doy( int iYear, int iMonth, int iDay )
|
|
{
|
|
int i;
|
|
int iDoy = 0;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_doy(%d, %d, %d)", iYear, iMonth, iDay));
|
|
|
|
for( i = 1; i < iMonth; i++ )
|
|
iDoy += hb_daysinmonth( iYear, i );
|
|
|
|
return iDoy + iDay;
|
|
}
|
|
|
|
int hb_wom( int iYear, int iMonth, int iDay )
|
|
{
|
|
int iWom;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_wom(%d, %d, %d)", iYear, iMonth, iDay));
|
|
|
|
iWom = iDay + hb_dateDOW( iYear, iMonth, 1 ) - 1;
|
|
if( iWom > 0 )
|
|
return ( iWom - hb_dateDOW( iYear, iMonth, iDay ) ) / 7 + 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
int hb_woy( int iYear, int iMonth, int iDay, BOOL bISO )
|
|
{
|
|
int iWeek, n;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_woy(%d, %d, %d, %d)", iYear, iMonth, iDay, (int) bISO));
|
|
|
|
iDay = hb_doy( iYear, iMonth, iDay );
|
|
n = ( ( ( 1 - ( bISO ? 1 : 0 ) ) % 7 ) ) - 1;
|
|
iDay += ( n > 0 ) ? 1 : 0;
|
|
iWeek = iDay / 7;
|
|
if( bISO )
|
|
iWeek += ( n < 4 ) ? 1 : 0;
|
|
else
|
|
++iWeek;
|
|
|
|
return iWeek;
|
|
}
|
|
|
|
HB_FUNC( AMONTHS )
|
|
{
|
|
PHB_ITEM pReturn = hb_itemArrayNew( 12 ); /* Create array */
|
|
int i;
|
|
|
|
for( i = 0; i < 12; i++ )
|
|
{
|
|
PHB_ITEM pString = hb_itemPutC( NULL, ( char * ) hb_langDGetItem( HB_LANG_ITEM_BASE_MONTH + i ) );
|
|
hb_itemArrayPut( pReturn, i+1, pString );
|
|
hb_itemRelease( pString );
|
|
}
|
|
hb_itemReturn( pReturn );
|
|
hb_itemRelease( pReturn );
|
|
}
|
|
|
|
HB_FUNC( ADAYS )
|
|
{
|
|
PHB_ITEM pReturn = hb_itemArrayNew( 7 ); /* Create array */
|
|
int i;
|
|
|
|
for( i = 0; i < 7; i++ )
|
|
{
|
|
PHB_ITEM pString = hb_itemPutC( NULL, ( char * ) hb_langDGetItem( HB_LANG_ITEM_BASE_DAY + i ) );
|
|
hb_itemArrayPut( pReturn, i + 1, pString );
|
|
hb_itemRelease( pString );
|
|
}
|
|
hb_itemReturn( pReturn );
|
|
hb_itemRelease( pReturn );
|
|
}
|
|
|
|
HB_FUNC( ISLEAPYEAR )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATE );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
hb_retl( hb_isleapyear( iYear ) );
|
|
}
|
|
else
|
|
hb_retl( FALSE );
|
|
}
|
|
|
|
HB_FUNC( DAYSINMONTH )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATE );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
hb_retni( hb_daysinmonth( iYear, iMonth ) );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
HB_FUNC( EOM )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATE );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
hb_retd( iYear, iMonth, hb_daysinmonth( iYear, iMonth ) );
|
|
}
|
|
else
|
|
hb_retdl( 0 );
|
|
}
|
|
|
|
HB_FUNC( BOM )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATE );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
hb_retd( iYear, iMonth, 1 );
|
|
}
|
|
else
|
|
hb_retdl( 0 );
|
|
}
|
|
|
|
HB_FUNC( WOM )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATE );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
hb_retni( hb_wom( iYear, iMonth, iDay ) );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
HB_FUNC( DOY )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATE );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
hb_retni( hb_doy( iYear, iMonth, iDay ) );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
/* Return the nWeek of the year (1 - 52, 0 - 52 if ISO) */
|
|
|
|
HB_FUNC( WOY )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATE );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
hb_retni( hb_woy( iYear, iMonth, iDay, ISLOG( 2 ) ? hb_parl( 2 ) : TRUE ) );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
HB_FUNC( EOY )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATE );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
hb_retd( iYear, 12, 31 );
|
|
}
|
|
else
|
|
hb_retdl( 0 );
|
|
}
|
|
|
|
HB_FUNC( BOY )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATE );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
hb_retd( iYear, 1, 1 );
|
|
}
|
|
else
|
|
hb_retdl( 0 );
|
|
}
|
|
|
|
/*
|
|
HB_FUNC( DATETIME )
|
|
{
|
|
time_t current_time;
|
|
|
|
time( ¤t_time );
|
|
|
|
hb_retc( ctime( ¤t_time ) );
|
|
}
|
|
*/
|