* src/vm/set.c
* Reset default value to "hb_out.log".
+ mpkg_nightly.sh
+ Added script to generate nightly sources.
; TODO: Upload nightlies to sf.net.
; TODO: Change nightly filenames to match our normal source releases.
; TOFIX: Current .zip nighly has wrong (*nix) EOLs. This has to be
changed to CRLF.
* INSTALL
* Changed nightly script URLs to point to sf.net file area.
! Minor fix to bug tracker address.
* contrib/xhb/regexrpl.prg
* contrib/hbtip/httpcli.prg
* contrib/hbtip/mail.prg
! Fixed to use EMPTY() on HB_REGEX[ALL]() return
value instead of NIL check.
Required after recent change in HB_REGEX*()
return values in no-match case.
* contrib/hbcurl/hbcurl.c
* contrib/hbcurl/hbcurl.ch
+ Added support to download-to/upload-from file handle.
* contrib/hbqt/qtgui/Makefile
* contrib/hbqt/qtcore/Makefile
* contrib/hbqt/Makefile
* contrib/hbqt/gtqtc/Makefile
* contrib/hbqt/qtnetwork/Makefile
! Fixed to not build separate HBQT libs for static
linkage for non-win/wce targets.
* package/mpkg_win.nsi
* package/winuni/mpkg_win_uni.nsi
* Changed to use 'Harbour Project' as folder name in registry.
(instead of 'Harbour'). Just to be consistent.
* package/winuni/mpkg_win_uni.nsi
+ Add major.minor version number to registry folder names.
This allows multiple major versions of Harbour to be installed
in parallel.
* contrib/xhb/ttable.prg
% '&("{||" + c + "}")' -> HB_MACROBLOCK()
* contrib/xhb/trpccli.prg
* contrib/xhb/hblognet.prg
* contrib/xhb/xcstr.prg
* contrib/xhb/tedit.prg
* contrib/xhb/xdbmodst.prg
* contrib/xhb/trpc.prg
* contrib/xhb/thtm.prg
* contrib/xhb/dumpvar.prg
* contrib/xhb/xhbmt.prg
* contrib/xhb/xhberr.prg
* contrib/xhb/ttable.prg
* contrib/xhb/txml.prg
* '.NOT.' -> '!'
% ValType( x ) == "Y" -> IS*()
* Some other basic formatting and cleanup.
* src/rtl/hbini.prg
* examples/httpsrv/session.prg
* Formatting.
* tests/db_brows.prg
* tests/server.prg
* tests/testrdd2.prg
* tests/setkeys.prg
* contrib/hbtip/tests/tiptest.prg
* contrib/hbtip/tests/loadhtml.prg
* examples/hbsqlit2/tests/hbsqlite.prg
* examples/gtwvw/tests/wvwtest9.prg
* examples/gtwvw/tests/ebtest7.prg
* '.NOT.' -> '!'
293 lines
9.1 KiB
Plaintext
293 lines
9.1 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* dbModifyStructure( <cFile> ) -> lSuccess
|
|
*
|
|
* Copyright 2009 Ron Pinkas <Ron.Pinkas at xHarbour.com>
|
|
* www - http://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.
|
|
*
|
|
*/
|
|
|
|
#include "common.ch"
|
|
#include "dbstruct.ch"
|
|
|
|
#include "dbinfo.ch"
|
|
#include "error.ch"
|
|
|
|
#ifndef EG_RENAME
|
|
#define EG_RENAME 26
|
|
#endif
|
|
|
|
#xtranslate THROW(<oErr>) => (Eval(ErrorBlock(), <oErr>), Break(<oErr>))
|
|
|
|
/*
|
|
xHarbour extensions by Ron Pinkas
|
|
*/
|
|
//----------------------------------------------------------------------------//
|
|
FUNCTION dbModifyStructure( cFile )
|
|
|
|
LOCAL lRet
|
|
LOCAL cExt
|
|
LOCAL cTable
|
|
LOCAL cBakFile
|
|
LOCAL cStructureFile
|
|
LOCAL cNewFile
|
|
LOCAL oErr
|
|
LOCAL nPresetArea := Select()
|
|
LOCAL nSourceArea
|
|
LOCAL cDateTime := SubStr( dtos( Date() ), 3 ) + "." + StrTran( Left( Time(), 5 ), ":", "." )
|
|
|
|
BEGIN SEQUENCE WITH {|oErr| Break( oErr )}
|
|
|
|
// Open exclusively, get name info, and create the structure db.
|
|
//-------------------------------------------------------------//
|
|
USE ( cFile ) ALIAS ModifySource EXCLUSIVE NEW
|
|
nSourceArea := Select()
|
|
|
|
cFile := dbInfo( DBI_FULLPATH )
|
|
cExt := dbInfo( DBI_TABLEEXT )
|
|
|
|
hb_FNameSplit( cFile, , @cTable )
|
|
|
|
cBakFile := cTable + ".bak." + cDateTime + cExt
|
|
cStructureFile := cTable + ".str." + cDateTime + cExt
|
|
cNewFile := cTable + ".new." + cDateTime + cExt
|
|
|
|
COPY STRUCTURE EXTENDED TO ( cStructureFile )
|
|
//-------------------------------------------------------------//
|
|
|
|
// Let user modify the structure.
|
|
//-------------------------------------------------------------//
|
|
USE ( cStructureFile ) ALIAS NewStructure EXCLUSIVE NEW
|
|
|
|
Browse( 0, 0, Min( 20, MaxRow() - 1 ), Min( MaxCol() - 30, 50 ) )
|
|
|
|
CLOSE
|
|
|
|
CREATE ( cNewFile ) FROM ( cStructureFile ) ALIAS NEW_MODIFIED NEW
|
|
//-------------------------------------------------------------//
|
|
|
|
|
|
// Import data into the new file, and close it
|
|
//-------------------------------------------------------------//
|
|
lRet := dbImport( nSourceArea )
|
|
CLOSE
|
|
|
|
SELECT ( nSourceArea )
|
|
CLOSE
|
|
|
|
SELECT ( nPresetArea )
|
|
//-------------------------------------------------------------//
|
|
|
|
// Rename original as backup, and new file as the new original.
|
|
//-------------------------------------------------------------//
|
|
IF lRet
|
|
IF FRename( cFile, cBakFile ) == -1
|
|
BREAK
|
|
ENDIF
|
|
|
|
IF FRename( cNewFile, cFile ) == -1
|
|
// If we can't then try to restore backup as original
|
|
IF FRename( cBakFile, cFile ) == -1
|
|
// Oops - must advise the user!
|
|
oErr := ErrorNew()
|
|
oErr:severity := ES_ERROR
|
|
oErr:genCode := EG_RENAME
|
|
oErr:subSystem := "DBCMD"
|
|
oErr:canDefault := .F.
|
|
oErr:canRetry := .F.
|
|
oErr:canSubtitute := .F.
|
|
oErr:operation := cFile
|
|
oErr:subCode := 1101
|
|
oErr:args := { cNewFile, cBakFile }
|
|
|
|
BREAK oErr
|
|
ENDIF
|
|
ENDIF
|
|
ENDIF
|
|
//-------------------------------------------------------------//
|
|
|
|
RECOVER USING oErr
|
|
IF oErr:ClassName == "ERROR"
|
|
IF oErr:genCode == EG_RENAME
|
|
// This kind of error must be reported
|
|
lRet := Throw( oErr )
|
|
ELSE
|
|
lRet := .F.
|
|
ENDIF
|
|
ELSE
|
|
lRet := .F.
|
|
ENDIF
|
|
END SEQUENCE
|
|
|
|
SELECT ( nPresetArea )
|
|
|
|
RETURN lRet
|
|
|
|
//----------------------------------------------------------------------------//
|
|
FUNCTION dbImport( xSource )
|
|
|
|
RETURN dbMerge( xSource )
|
|
|
|
//----------------------------------------------------------------------------//
|
|
FUNCTION dbMerge( xSource, lAppend )
|
|
|
|
LOCAL nArea, nSource, nRecNo
|
|
LOCAL aFields
|
|
LOCAL cField, xField
|
|
LOCAL nSourcePos, aTranslate := {}, aTranslation
|
|
// LOCAL oErr
|
|
LOCAL cTargetType
|
|
|
|
// Safety
|
|
//-------------------------------------------------------------//
|
|
IF LastRec() > 0
|
|
IF ! lAppend
|
|
RETURN .F.
|
|
ENDIF
|
|
ENDIF
|
|
//-------------------------------------------------------------//
|
|
|
|
// Validate args
|
|
//-------------------------------------------------------------//
|
|
IF ISCHARACTER( xSource )
|
|
nArea := Select()
|
|
|
|
USE ( xSource ) ALIAS MergeSource EXCLUSIVE NEW
|
|
nSource := Select()
|
|
|
|
SELECT ( nArea )
|
|
ELSEIF ISNUMBER( xSource )
|
|
nSource := xSource
|
|
ELSE
|
|
RETURN .F.
|
|
ENDIF
|
|
//-------------------------------------------------------------//
|
|
|
|
// Temp working record
|
|
IF LastRec() == 0
|
|
APPEND BLANK
|
|
ENDIF
|
|
|
|
// Create translation plan
|
|
//-------------------------------------------------------------//
|
|
aFields := Array( FCount() )
|
|
aFields( aFields )
|
|
|
|
FOR EACH cField IN aFields
|
|
nSourcePos := (nSource)->( FieldPos( cField ) )
|
|
|
|
IF nSourcePos > 0
|
|
BEGIN SEQUENCE WITH {|oErr| Break( oErr )}
|
|
// Save
|
|
xField := FieldGet( cField:__EnumIndex() )
|
|
|
|
// Test type compatability
|
|
FieldPut( cField:__EnumIndex(), (nSource)->( FieldGet( nSourcePos ) ) )
|
|
|
|
// Restore
|
|
FieldPut( cField:__EnumIndex(), xField )
|
|
|
|
// Ok to process
|
|
aAdd( aTranslate, { cField:__EnumIndex(), nSourcePos, {|xSource| xSource } } )
|
|
RECOVER // USING oErr
|
|
cTargetType := ValType( FieldGet( cField:__EnumIndex() ) )
|
|
|
|
BEGIN SEQUENCE WITH {|oErr| Break( oErr )}
|
|
// Test type compatability
|
|
FieldPut( cField:__EnumIndex(), ValToType( (nSource)->( FieldGet( nSourcePos ) ), cTargetType ) )
|
|
|
|
// Restore
|
|
FieldPut( cField:__EnumIndex(), xField )
|
|
|
|
// Ok to process
|
|
aAdd( aTranslate, { cField:__EnumIndex(), nSourcePos, {|xSource| ValToType( xSource, cTargetType ) } } )
|
|
RECOVER // USING oErr
|
|
//TraceLog( oErr:Description, oErr:Operation )
|
|
END SEQUENCE
|
|
END SEQUENCE
|
|
ENDIF
|
|
NEXT
|
|
//-------------------------------------------------------------//
|
|
|
|
// Reset
|
|
//-------------------------------------------------------------//
|
|
IF LastRec() == 1 .AND. ! lAppend
|
|
DELETE
|
|
ZAP
|
|
ENDIF
|
|
//-------------------------------------------------------------//
|
|
|
|
// Process
|
|
//-------------------------------------------------------------//
|
|
nRecNo := (nSource)->( RecNo() )
|
|
(nSource)->( dbGoTop(1) )
|
|
|
|
WHILE ! (nSource)->( Eof() )
|
|
APPEND BLANK
|
|
|
|
FOR EACH aTranslation IN aTranslate
|
|
FieldPut( aTranslation[1], Eval( aTranslation[3], (nSource)->( FieldGet( aTranslation[2] ) ) ) )
|
|
NEXT
|
|
|
|
(nSource)->( dbSkip() )
|
|
ENDDO
|
|
|
|
(nSource)->( dbGoTo( nRecNo ) )
|
|
//-------------------------------------------------------------//
|
|
|
|
// Reset
|
|
//-------------------------------------------------------------//
|
|
IF ! Empty( nArea )
|
|
SELECT ( nSource )
|
|
CLOSE
|
|
SELECT ( nArea )
|
|
ENDIF
|
|
//-------------------------------------------------------------//
|
|
|
|
RETURN .T.
|
|
|
|
//----------------------------------------------------------------------------//
|