From 9d548cbf35a35d49b0651872e5d0a145dc67b22c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 3 Apr 2012 10:12:59 +0000 Subject: [PATCH] 2012-04-03 12:08 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/rddads/rddads.hbx * contrib/rddads/adsfunc.c + added ADSDDADDINDEXFILE(). posted by Lucas De Beltran. * contrib/hbformat/utils/hbformat.prg % changed manual logic to HB_DIRSEPADD() call ! changed SET( _SET_DIRSEPARATOR ) to hb_ps() --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/hbformat/utils/hbformat.prg | 7 +++---- harbour/contrib/rddads/adsfunc.c | 12 ++++++++++++ harbour/contrib/rddads/rddads.hbx | 1 + 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2a5a8906ff..d739953964 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2012-04-03 12:08 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/rddads/rddads.hbx + * contrib/rddads/adsfunc.c + + added ADSDDADDINDEXFILE(). posted by Lucas De Beltran. + + * contrib/hbformat/utils/hbformat.prg + % changed manual logic to HB_DIRSEPADD() call + ! changed SET( _SET_DIRSEPARATOR ) to hb_ps() + 2012-04-03 02:28 UTC+0200 Viktor Szakats (harbour syenar.net) * src/lang/Makefile + src/lang/msghuutf.c diff --git a/harbour/contrib/hbformat/utils/hbformat.prg b/harbour/contrib/hbformat/utils/hbformat.prg index 7bdffad60b..cb20c2495a 100644 --- a/harbour/contrib/hbformat/utils/hbformat.prg +++ b/harbour/contrib/hbformat/utils/hbformat.prg @@ -92,7 +92,7 @@ PROCEDURE Main( ... ) ELSE cInitDir := iif( ( i := RAt( "\", cFileName ) ) == 0, ; iif( ( i := RAt( "/", cFileName ) ) == 0, ; - "." + Set( _SET_DIRSEPARATOR ), Left( cFileName, i ) ), ; + "." + hb_ps(), Left( cFileName, i ) ), ; Left( cFileName, i ) ) cFileName := iif( i == 0, cFileName, SubStr( cFileName, i + 1 ) ) DirEval( cInitDir, cFileName, lRecursive, {| name | Reformat( oRef, name ) } ) @@ -168,9 +168,8 @@ STATIC PROCEDURE DirEval( cInitDir, cMask, lRecur, bCode ) LOCAL i, nLen, aFiles - IF !( Right( cInitDir, 1 ) == Set( _SET_DIRSEPARATOR ) ) - cInitDir += Set( _SET_DIRSEPARATOR ) - ENDIF + cInitDir := hb_DirSepAdd( cInitDir ) + cMask := iif( cMask == NIL, hb_osFileMask(), Upper( cMask ) ) aFiles := Directory( cInitDir + hb_osFileMask(), "HSD" ) diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c index f8c5cc6c2a..dfb2daad72 100644 --- a/harbour/contrib/rddads/adsfunc.c +++ b/harbour/contrib/rddads/adsfunc.c @@ -1752,6 +1752,18 @@ HB_FUNC( ADSDDREMOVETABLE ) #endif } +HB_FUNC( ADSDDADDINDEXFILE ) +{ +#if ADS_LIB_VERSION >= 600 + hb_retl( AdsDDAddIndexFile( HB_ADS_PARCONNECTION( 4 ) /* hConnect */, + ( UNSIGNED8 * ) hb_parcx( 1 ) /* pTableName */, + ( UNSIGNED8 * ) hb_parcx( 2 ) /* pIndexName */, + ( UNSIGNED8 * ) hb_parcx( 3 ) /* pucComment */ ) == AE_SUCCESS ); +#else + hb_retl( HB_FALSE ); +#endif +} + HB_FUNC( ADSDDREMOVEINDEXFILE ) { #if ADS_LIB_VERSION >= 600 diff --git a/harbour/contrib/rddads/rddads.hbx b/harbour/contrib/rddads/rddads.hbx index 842699ec95..c6b301cd72 100644 --- a/harbour/contrib/rddads/rddads.hbx +++ b/harbour/contrib/rddads/rddads.hbx @@ -53,6 +53,7 @@ DYNAMIC ADSCREATEFTSINDEX DYNAMIC ADSCREATESAVEPOINT DYNAMIC ADSCREATESQLSTATEMENT DYNAMIC ADSCUSTOMIZEAOF +DYNAMIC ADSDDADDINDEXFILE DYNAMIC ADSDDADDTABLE DYNAMIC ADSDDADDUSERTOGROUP DYNAMIC ADSDDCREATE