fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-09-03 01:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
- harbour/contrib/apollo/makefile
  + harbour/contrib/apollo/Makefile
    * renamed

  * harbour/contrib/apollo/test/apollo.ch
  * harbour/contrib/pgsql/postgres.c
  * harbour/contrib/htmllib/errorsys.prg
  * harbour/contrib/adordd/adordd.ch
    * converted TABs to SPACEs
This commit is contained in:
Przemyslaw Czerpak
2007-09-02 23:23:38 +00:00
parent 503c1ddf13
commit fae89610f2
6 changed files with 96 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -8,6 +8,17 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-09-03 01:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
- harbour/contrib/apollo/makefile
+ harbour/contrib/apollo/Makefile
* renamed
* harbour/contrib/apollo/test/apollo.ch
* harbour/contrib/pgsql/postgres.c
* harbour/contrib/htmllib/errorsys.prg
* harbour/contrib/adordd/adordd.ch
* converted TABs to SPACEs
2007-09-02 17:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/hbgtmk.sh
* harbour/tests/codebl.prg

84
harbour/contrib/adordd/adordd.ch
View File

@@ -67,55 +67,55 @@
#define adLockBatchOptimistic 4
// Field Types
#define adEmpty 0
#define adTinyInt 16
#define adSmallInt 2
#define adInteger 3
#define adBigInt 20
#define adUnsignedTinyInt 17
#define adUnsignedSmallInt 18
#define adUnsignedInt 19
#define adUnsignedBigInt 21
#define adSingle 4
#define adDouble 5
#define adCurrency 6
#define adDecimal 14
#define adNumeric 131
#define adBoolean 11
#define adError 10
#define adUserDefined 132
#define adVariant 12
#define adIDispatch 9
#define adIUnknown 13
#define adGUID 72
#define adDate 7
#define adDBDate 133
#define adDBTime 134
#define adDBTimeStamp 135
#define adBSTR 8
#define adChar 129
#define adVarChar 200
#define adLongVarChar 201
#define adWChar 130
#define adVarWChar 202
#define adLongVarWChar 203
#define adBinary 128
#define adVarBinary 204
#define adLongVarBinary 205
#define adChapter 136
#define adFileTime 64
#define adPropVariant 138
#define adVarNumeric 139
#define adArray // &H2000
#define adEmpty 0
#define adTinyInt 16
#define adSmallInt 2
#define adInteger 3
#define adBigInt 20
#define adUnsignedTinyInt 17
#define adUnsignedSmallInt 18
#define adUnsignedInt 19
#define adUnsignedBigInt 21
#define adSingle 4
#define adDouble 5
#define adCurrency 6
#define adDecimal 14
#define adNumeric 131
#define adBoolean 11
#define adError 10
#define adUserDefined 132
#define adVariant 12
#define adIDispatch 9
#define adIUnknown 13
#define adGUID 72
#define adDate 7
#define adDBDate 133
#define adDBTime 134
#define adDBTimeStamp 135
#define adBSTR 8
#define adChar 129
#define adVarChar 200
#define adLongVarChar 201
#define adWChar 130
#define adVarWChar 202
#define adLongVarWChar 203
#define adBinary 128
#define adVarBinary 204
#define adLongVarBinary 205
#define adChapter 136
#define adFileTime 64
#define adPropVariant 138
#define adVarNumeric 139
#define adArray // &H2000
#define adRecDeleted 4
#define adRecDeleted 4
#define adUseNone 1
#define adUseServer 2
#define adUseClient 3
#define adUseClientBatch 3
#define adKeyForeign 2
#define adKeyForeign 2
#command USE <(db)> [VIA <rdd>] [ALIAS <a>] [<nw: NEW>] ;
[<ex: EXCLUSIVE>] [<sh: SHARED>] [<ro: READONLY>] ;

0
harbour/contrib/apollo/makefile → harbour/contrib/apollo/Makefile
View File

14
harbour/contrib/apollo/test/apollo.ch
View File

@@ -134,14 +134,14 @@
#define SDE_SP_GETDRIVER 2000 //Get the active driver
#define SDE_SP_SETSTRDEFLEN 2001 //Set the default lenght for STR, if 2nd parameter is absent and field lenght zero
#define SDE_SP_SETSTRDEFDEC 2002 //Set the default decimals for STR, if 3d parameter is absent and field lenght zero
#define SDE_SP_SETSTRDEFDEC 2002 //Set the default decimals for STR, if 3d parameter is absent and field lenght zero
#define SDE_SP_SETDEFAPPEND 2003 //Set default behavior for ordering ordering for non-unique key like FOX/Clipper
#define SDE_SP_SETMEMOMIXED 2004 //Set pure Clipper's memo for NSX driver
#define SDE_SP_BDESPECIFIC 2005 //Set the treatment of LIKE operator in accoring to BDE
#define SDE_SP_DBASEDATEHEADER 2006 //Set the using of DBF header in according to DbaseIII+ specification
#define SDE_SP_SETAUTOPAD 2007
#define SDE_SP_GETAUTOPAD 2008
#define SDE_SP_SETDEFAPPEND 2003 //Set default behavior for ordering ordering for non-unique key like FOX/Clipper
#define SDE_SP_SETMEMOMIXED 2004 //Set pure Clipper's memo for NSX driver
#define SDE_SP_BDESPECIFIC 2005 //Set the treatment of LIKE operator in accoring to BDE
#define SDE_SP_DBASEDATEHEADER 2006 //Set the using of DBF header in according to DbaseIII+ specification
#define SDE_SP_SETAUTOPAD 2007
#define SDE_SP_GETAUTOPAD 2008
//Index information for current workarea

48
harbour/contrib/htmllib/errorsys.prg
View File

@@ -5,7 +5,7 @@
/***
*
* Errorsys.prg
* Errorsys.prg
*
* Standard Clipper error handler
*
@@ -84,9 +84,9 @@ STATIC scErrFooter := " "
/***
* ErrorSys()
* ErrorSys()
*
* Note: automatically executes at startup
* Note: automatically executes at startup
*/
//ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
@@ -98,7 +98,7 @@ return
/***
* DefError()
* DefError()
*/
//ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
@@ -124,7 +124,7 @@ LOCAL nH := IF( PageHandle() == NIL, 0, PageHandle() )
ENDIF
ENDIF
// for network open error, set NETERR() and subsystem default
// for network open error, set NETERR() and subsystem default
IF ( e:genCode == EG_OPEN .and. (e:osCode == 32 .OR. e:osCode == 5);
.and. e:canDefault )
@@ -142,11 +142,11 @@ LOCAL nH := IF( PageHandle() == NIL, 0, PageHandle() )
END
// build error message
// build error message
cMessage += ErrorMessage(e)
// display message and traceback
// display message and traceback
IF ( !Empty(e:osCode) )
cMessage += " (DOS Error : " + NTRIM(e:osCode) + ")"
END
@@ -192,7 +192,7 @@ LOCAL nH := IF( PageHandle() == NIL, 0, PageHandle() )
cErrString += "Called from "+ Trim(ProcName(i)) + ;
"(" + NTRIM(ProcLine(i)) + ") <BR>" + CRLF()
i++
i++
END
cErrstring += '</EM>'
@@ -248,45 +248,45 @@ RETURN( scErrFooter )
/***
* ErrorMessage()
* ErrorMessage()
*/
//ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
STATIC FUNC ErrorMessage(e)
//ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
local cMessage :=""
// start error message
// start error message
cMessage += if( e:severity > ES_WARNING, "Error ", "Warning " )
// add subsystem name if available
// add subsystem name if available
IF ( ValType(e:subsystem) == "C" )
cMessage += e:subsystem()
cMessage += e:subsystem()
ELSE
cMessage += "???"
cMessage += "???"
END
// add subsystem's error code if available
if ( ValType(e:subCode) == "N" )
cMessage += ("/" + NTRIM(e:subCode))
// add subsystem's error code if available
IF ( ValType(e:subCode) == "N" )
cMessage += ("/" + NTRIM(e:subCode))
ELSE
cMessage += "/???"
cMessage += "/???"
END
// add error description if available
if ( ValType(e:description) == "C" )
cMessage += ("<BR> " + e:description)
// add error description if available
IF ( ValType(e:description) == "C" )
cMessage += ("<BR> " + e:description)
END
// add either filename or operation
if ( !Empty(e:filename) )
cMessage += (": " + e:filename)
// add either filename or operation
IF ( !Empty(e:filename) )
cMessage += (": " + e:filename)
ELSEIF ( !Empty(e:operation) )
cMessage += (": " + e:operation)
cMessage += (": " + e:operation)
END
cMessage += CRLF()

24
harbour/contrib/pgsql/postgres.c
View File

@@ -61,11 +61,11 @@
#define VARHDRSZ 4
#define BOOLOID 16
#define INT8OID 20
#define INT2OID 21
#define INT4OID 23
#define TEXTOID 25
#define OIDOID 26
#define INT8OID 20
#define INT2OID 21
#define INT4OID 23
#define TEXTOID 25
#define OIDOID 26
#define FLOAT4OID 700
#define FLOAT8OID 701
#define CASHOID 790
@@ -833,13 +833,13 @@ HB_FUNC(PQESCAPEBYTEACONN)
TODO: Implement Full Large Objects Support
TODO: Implement Prepared Query handling
extern int lo_open(PGconn *conn, Oid lobjId, int mode);
extern int lo_close(PGconn *conn, int fd);
extern int lo_read(PGconn *conn, int fd, char *buf, size_t len);
extern int lo_write(PGconn *conn, int fd, char *buf, size_t len);
extern int lo_lseek(PGconn *conn, int fd, int offset, int whence);
extern Oid lo_creat(PGconn *conn, int mode);
extern int lo_tell(PGconn *conn, int fd);
extern int lo_open(PGconn *conn, Oid lobjId, int mode);
extern int lo_close(PGconn *conn, int fd);
extern int lo_read(PGconn *conn, int fd, char *buf, size_t len);
extern int lo_write(PGconn *conn, int fd, char *buf, size_t len);
extern int lo_lseek(PGconn *conn, int fd, int offset, int whence);
extern Oid lo_creat(PGconn *conn, int mode);
extern int lo_tell(PGconn *conn, int fd);
PGresult *PQprepare(PGconn *conn,
const char *stmtName,