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

2009-01-26 22:45 UTC+0100 Francesco Saverio Giudice (info/at/fsgiudice.com)

Browse Source 
* harbour/source/rdd/usrrdd/rdds/arrayrdd.prg
    * fixed AR_CREATE() to be compatible with dbCreate() extension
      parameters
  * harbour/source/rdd/usrrdd/example/exarr.prg
    * updated
This commit is contained in:
Francesco Saverio Giudice
2009-01-26 21:46:51 +00:00
parent 7c18347f57
commit f5bdccf82a
3 changed files with 106 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -8,6 +8,13 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-01-26 22:45 UTC+0100 Francesco Saverio Giudice (info/at/fsgiudice.com)
* harbour/source/rdd/usrrdd/rdds/arrayrdd.prg
* fixed AR_CREATE() to be compatible with dbCreate() extension
parameters
* harbour/source/rdd/usrrdd/example/exarr.prg
* updated
2009-01-26 13:02 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/hbziparc/hbziparc.prg
! Fixed <acFiles> behavior if the parameter is not passed.

6
harbour/source/rdd/usrrdd/example/exarr.prg
View File

@@ -52,8 +52,7 @@
REQUEST ARRAYRDD
// Actually: 20090126 doesn't work
//#define USE_DBCREATE_EXTENSIONS
#define USE_DBCREATE_EXTENSIONS
PROCEDURE MAIN()
LOCAL aStruct
@@ -74,11 +73,14 @@ PROCEDURE MAIN()
#ifndef USE_DBCREATE_EXTENSIONS
? "Create it"
dbCreate( "arrtest.dbf", aStruct, "ARRAYRDD" )
wait
? "Open it"
USE arrtest.dbf VIA "ARRAYRDD"
wait
#else
? "Create it and leave opened"
dbCreate( "arrtest.dbf", aStruct, "ARRAYRDD", .T., "arrtest" )
wait
#endif
? "Show structure"

103
harbour/source/rdd/usrrdd/rdds/arrayrdd.prg
View File

@@ -67,6 +67,8 @@
#xtranslate THROW( <oErr> ) => ( Eval( ErrorBlock(), <oErr> ), Break( <oErr> ) )
//#define ACTIVATE_DEBUG // add xhb.lib to link
ANNOUNCE ARRAYRDD
#define DATABASE_FILENAME 1
@@ -103,8 +105,6 @@ ANNOUNCE ARRAYRDD
*/
STATIC FUNCTION AR_INIT( nRDD )
//Tracelog( "nRDD = ", nRDD )
/* Init DBF Hash */
USRRDD_RDDDATA( nRDD, hb_Hash() )
@@ -170,6 +170,10 @@ STATIC FUNCTION AR_CREATEFIELDS( nWA, aStruct )
LOCAL nResult := SUCCESS
LOCAL aFieldStruct, aField
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_CREATEFIELDS(): nWA = %i, aStruct = %s\n\r", nWA, hb_ValToExp( aStruct ) )
#endif
// Setting WA number to current WorkArea
aWAData[ WADATA_WORKAREA ] := nWA
@@ -201,9 +205,11 @@ STATIC FUNCTION AR_CREATE( nWA, aOpenInfo )
LOCAL aWAData := USRRDD_AREADATA( nWA )
LOCAL hRDDData := USRRDD_RDDDATA( USRRDD_ID( nWA ) )
LOCAL cName
LOCAL cFullName, aDBFData
LOCAL cFullName, aDBFData, nResult//, aFieldStruct, aField, aStruct
//hb_ToOutDebug( "AR_CREATE(): aOpenInfo = %s\n\r", hb_ValToExp( aOpenInfo ) )
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_CREATE(): nWA = %i, aOpenInfo = %s\n\r", nWA, hb_ValToExp( aOpenInfo ) )
#endif
/* getting database infos from current workarea */
aDBFData := aWAData[ WADATA_DATABASE ]
@@ -259,16 +265,26 @@ STATIC FUNCTION AR_CREATE( nWA, aOpenInfo )
aWAData[ WADATA_WORKAREA ] := nWA
aWAData[ WADATA_OPENINFO ] := aOpenInfo // Put open informations
// increase open number
aDBFData[ DATABASE_OPENNUMBER ]++
/* Call SUPER OPEN to finish allocating work area (f.e.: alias settings) */
nResult := UR_SUPER_OPEN( nWA, aOpenInfo )
RETURN SUCCESS
IF nResult == SUCCESS
/* Add a new open number */
aDBFData[ DATABASE_OPENNUMBER ]++
// default values for Records == 0
aWAData[ WADATA_EOF ] := aWAData[ WADATA_BOF ] := .T.
aWAData[ WADATA_RECNO ] := 1
ENDIF
RETURN nResult
STATIC FUNCTION AR_OPEN( nWA, aOpenInfo )
LOCAL cFullName, cName, hRDDData, aWAData, aDBFData
LOCAL aStruct, oError, aFieldStruct, aField, nResult
//hb_ToOutDebug( "AR_OPEN(): aOpenInfo = %s\n\r", hb_ValToExp( aOpenInfo ) )
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_OPEN(): nWA = %i, aOpenInfo = %s\n\r", nWA, hb_ValToExp( aOpenInfo ) )
#endif
cFullName := Upper( aOpenInfo[ UR_OI_NAME ] )
@@ -371,6 +387,10 @@ STATIC FUNCTION AR_CLOSE( nWA )
LOCAL aWAData := USRRDD_AREADATA( nWA )
LOCAL aDBFData := aWAData[ WADATA_DATABASE ]
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_CLOSE(): nWA = %i\n\r", nWA )
#endif
IF HB_ISARRAY( aDBFData )
// decrease open number
aDBFData[ DATABASE_OPENNUMBER ]--
@@ -388,6 +408,10 @@ STATIC FUNCTION AR_GETVALUE( nWA, nField, xValue )
LOCAL aStruct := aDBFData[ DATABASE_STRUCT ]
LOCAL nRecNo := aWAData[ WADATA_RECNO ]
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_GETVALUE(): nWA = %i, nField = %i, xValue = %s\n\r", nWA, nField, xValue )
#endif
IF nField > 0 .AND. nField <= Len( aStruct )
IF aWAData[ WADATA_EOF ]
@@ -411,6 +435,10 @@ STATIC FUNCTION AR_PUTVALUE( nWA, nField, xValue )
LOCAL nRecNo := aWAData[ WADATA_RECNO ]
LOCAL xVal
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_PUTVALUE(): nWA = %i, nField = %i, xValue = %s\n\r", nWA, nField, xValue )
#endif
IF nField > 0 .AND. nField <= Len( aStruct ) .AND. ;
IIF( ValType( xValue ) == "C" .AND. aStruct[ nField ][ DBS_TYPE ] == "M", TRUE, ValType( xValue ) == aStruct[ nField ][ DBS_TYPE ] )
@@ -434,6 +462,10 @@ STATIC FUNCTION AR_GOTO( nWA, nRecord )
LOCAL aRecords := aDBFData[ DATABASE_RECORDS ]
LOCAL nRecCount := Len( aRecords )
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_GOTO(): nWA = %i, nRecord = %i\n\r", nWA, nRecord )
#endif
//if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE )
// return FAILURE;
//
@@ -480,6 +512,9 @@ STATIC FUNCTION AR_GOTO( nWA, nRecord )
RETURN SUCCESS
STATIC FUNCTION AR_GOTOID( nWA, nRecord )
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_GOTOID(): nWA = %i, nRecord = %i\n\r", nWA, nRecord )
#endif
RETURN AR_GOTO( nWA, nRecord )
STATIC FUNCTION AR_GOTOP( nWA )
@@ -489,6 +524,10 @@ STATIC FUNCTION AR_GOTOP( nWA )
LOCAL aRecInfo := aDBFData[ DATABASE_RECINFO ]
LOCAL nRecCount := Len( aRecords )
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_GOTOP(): nWA = %i\n\r", nWA )
#endif
IF nRecCount == 0
aWAData[ WADATA_EOF ] := aWAData[ WADATA_BOF ] := .T.
@@ -513,6 +552,10 @@ STATIC FUNCTION AR_GOBOTTOM( nWA )
LOCAL aRecords := aDBFData[ DATABASE_RECORDS ]
LOCAL aRecInfo := aDBFData[ DATABASE_RECINFO ]
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_GOBOTTOM(): nWA = %i\n\r", nWA )
#endif
IF Len( aRecords ) == 0
aWAData[ WADATA_EOF ] := aWAData[ WADATA_BOF ] := .T.
@@ -538,6 +581,10 @@ STATIC FUNCTION AR_SKIPFILTER( nWA, nRecords )
LOCAL aRecInfo := aDBFData[ DATABASE_RECINFO ]
LOCAL lBof, nToSkip
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_SKIPFILTER(): nWA = %i, nRecords = %i\n\r", nWA, nRecords )
#endif
nToSkip := IIF( nRecords > 0, 1, IIF( nRecords < 0, -1, 0 ) )
IF nToSkip != 0
@@ -574,6 +621,10 @@ STATIC FUNCTION AR_SKIPRAW( nWA, nRecords )
LOCAL lBof, lEof
LOCAL nResult
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_SKIPRAW(): nWA = %i, nRecords = %i\n\r", nWA, nRecords )
#endif
//if( pArea->lpdbPendingRel )
// SELF_FORCEREL( ( AREAP ) pArea );
@@ -607,6 +658,10 @@ STATIC FUNCTION AR_SKIPRAW( nWA, nRecords )
STATIC FUNCTION AR_BOF( nWA, lBof )
LOCAL aWAData := USRRDD_AREADATA( nWA )
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_BOF(): nWA = %i, lBof = %s\n\r", nWA, lBof )
#endif
// This is a hack to protect from dbf1.c skipraw hack
IF aWAData[ WADATA_FORCEBOF ] .AND. lBof
aWAData[ WADATA_BOF ] := lBof
@@ -620,6 +675,10 @@ STATIC FUNCTION AR_BOF( nWA, lBof )
STATIC FUNCTION AR_EOF( nWA, lEof )
LOCAL aWAData := USRRDD_AREADATA( nWA )
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_EOF(): nWA = %i, lEof = %s\n\r", nWA, lEof )
#endif
lEof := aWAData[ WADATA_EOF ]
RETURN SUCCESS
@@ -631,6 +690,10 @@ STATIC FUNCTION AR_DELETE( nWA )
LOCAL aOpenInfo := aWAData[ WADATA_OPENINFO ]
LOCAL oError
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_DELETE(): nWA = %i\n\r", nWA )
#endif
IF aOpenInfo[ UR_OI_READONLY ]
oError := ErrorNew()
@@ -666,6 +729,10 @@ STATIC FUNCTION AR_DELETED( nWA, lDeleted )
LOCAL aDBFData := aWAData[ WADATA_DATABASE ]
LOCAL aRecInfo := aDBFData[ DATABASE_RECINFO ]
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_DELETED(): nWA = %i, lDeleted = %s\n\r", nWA, lDeleted )
#endif
//lDeleted := .F.
IF Len( aRecInfo ) > 0 .AND. aWAData[ WADATA_RECNO ] <= Len( aRecInfo )
lDeleted := aRecInfo[ aWAData[ WADATA_RECNO ] ][ RECDATA_DELETED ]
@@ -684,6 +751,10 @@ STATIC FUNCTION AR_APPEND( nWA, nRecords )
LOCAL aOpenInfo := aWAData[ WADATA_OPENINFO ]
LOCAL oError, aRecord
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_APPEND(): nWA = %i, nRecords = %s\n\r", nWA, nRecords )
#endif
HB_SYMBOL_UNUSED( nRecords )
IF aOpenInfo[ UR_OI_READONLY ]
@@ -716,6 +787,10 @@ STATIC FUNCTION AR_RECID( nWA, nRecNo )
LOCAL aRecords := aDBFData[ DATABASE_RECORDS ]
LOCAL nRecCount := Len( aRecords )
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_RECID(): nWA = %i, nRecNo = %s\n\r", nWA, nRecNo )
#endif
IF aWAData[ WADATA_EOF ]
nRecNo := nRecCount + 1
ELSE
@@ -729,6 +804,10 @@ STATIC FUNCTION AR_RECCOUNT( nWA, nRecords )
LOCAL aDBFData := aWAData[ WADATA_DATABASE ]
LOCAL aRecords := aDBFData[ DATABASE_RECORDS ]
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_RECCOUNT(): nWA = %i, nRecords = %s\n\r", nWA, nRecords )
#endif
nRecords := Len( aRecords )
RETURN SUCCESS
@@ -739,6 +818,10 @@ STATIC FUNCTION AR_ZAP( nWA )
LOCAL aOpenInfo := aWAData[ WADATA_OPENINFO ]
LOCAL oError
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_ZAP(): nWA = %i\n\r", nWA )
#endif
IF aOpenInfo[ UR_OI_READONLY ]
oError := ErrorNew()
@@ -777,6 +860,10 @@ STATIC FUNCTION AR_ORDINFO( nWA, xMsg, xValue )
HB_SYMBOL_UNUSED( xMsg )
HB_SYMBOL_UNUSED( xValue )
#ifdef ACTIVATE_DEBUG
hb_ToOutDebug( "AR_ORDINFO(): nWA = %i, xMsg = %s, xValue = %s\n\r", nWA, xMsg, xValue )
#endif
/*
LOCAL hRDDData := USRRDD_RDDDATA( USRRDD_ID( nWA ) )
LOCAL aOpenInfo := hRDDData[ nWA ]:OPENINFO