Changeset: 242 fdbozzo - 15/05/2014 12:52:39:

This commit is contained in:
fdbozzo
2014-05-16 16:48:48 +02:00
parent 60f7029308
commit 2622910bf8

View File

@@ -358,6 +358,7 @@ LOCAL lnResp, loEx AS EXCEPTION
*ENDIF *ENDIF
loCnv = CREATEOBJECT("c_foxbin2prg") loCnv = CREATEOBJECT("c_foxbin2prg")
loEx = NULL loEx = NULL
lnResp = loCnv.ejecutar( tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDebug ; lnResp = loCnv.ejecutar( tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDebug ;
, '', NULL, @loEx, .F., tcOriginalFileName, tcRecompile, tcNoTimestamps ) , '', NULL, @loEx, .F., tcOriginalFileName, tcRecompile, tcNoTimestamps )
@@ -369,19 +370,25 @@ ADDPROPERTY(_SCREEN, 'ExitCode', lnResp)
SET COVERAGE TO SET COVERAGE TO
*-- Muy <20>til para procesos batch que capturan el c<>digo de error IF _VFP.STARTMODE # 4
IF _VFP.STARTMODE > 1 AND NOT EMPTY(lnResp) AND VARTYPE(loEx) = "O"
STORE NULL TO loEx, loCnv
RELEASE loEx, loCnv
DECLARE ExitProcess IN Win32API INTEGER ExitCode
ExitProcess(1)
QUIT
ELSE
STORE NULL TO loEx, loCnv STORE NULL TO loEx, loCnv
RELEASE loEx, loCnv RELEASE loEx, loCnv
RETURN lnResp RETURN lnResp
ENDIF ENDIF
IF EMPTY(lnResp) OR VARTYPE(loEx) # "O"
STORE NULL TO loEx, loCnv
RELEASE loEx, loCnv
QUIT
ENDIF
STORE NULL TO loEx, loCnv
RELEASE loEx, loCnv
*-- Muy <20>til para procesos batch que capturan el c<>digo de error
DECLARE ExitProcess IN Win32API INTEGER ExitCode
ExitProcess(1) && Esta debe ser de las <20>ltimas instrucciones
QUIT
******************************************************************************************************************* *******************************************************************************************************************
@@ -529,6 +536,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
THIS.c_CurDir = SYS(5) + CURDIR() THIS.c_CurDir = SYS(5) + CURDIR()
THIS.o_FSO = NEWOBJECT("Scripting.FileSystemObject") THIS.o_FSO = NEWOBJECT("Scripting.FileSystemObject")
ADDPROPERTY(_SCREEN, 'ExitCode', 0) ADDPROPERTY(_SCREEN, 'ExitCode', 0)
RETURN
ENDPROC ENDPROC
@@ -537,14 +545,19 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
LOCAL lcFileCDX LOCAL lcFileCDX
lcFileCDX = FORCEPATH( "TABLABIN.CDX", JUSTPATH(THIS.c_InputFile) ) lcFileCDX = FORCEPATH( "TABLABIN.CDX", JUSTPATH(THIS.c_InputFile) )
IF FILE( lcFileCDX ) *IF FILE( lcFileCDX )
ERASE ( lcFileCDX ) ERASE ( lcFileCDX )
ENDIF *ENDIF
THIS.writeLog_Flush() THIS.writeLog_Flush()
CATCH CATCH
FINALLY
THIS.o_FSO = NULL
ENDTRY ENDTRY
RETURN
ENDPROC ENDPROC
@@ -564,71 +577,82 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
#DEFINE FILE_ATTRIBUTE_TEMPORARY 512 #DEFINE FILE_ATTRIBUTE_TEMPORARY 512
#DEFINE FILE_ATTRIBUTE_COMPRESSED 2048 #DEFINE FILE_ATTRIBUTE_COMPRESSED 2048
DECLARE SHORT SetFileAttributes IN kernel32 STRING tcFileName, INTEGER dwFileAttributes TRY
DECLARE INTEGER GetFileAttributes IN kernel32 STRING tcFileName LOCAL loEx as Exception, dwFileAttributes
DECLARE SHORT 'SetFileAttributes' IN kernel32 AS 'fb2p_SetFileAttributes' STRING tcFileName, INTEGER dwFileAttributes
DECLARE INTEGER 'GetFileAttributes' IN kernel32 AS 'fb2p_GetFileAttributes' STRING tcFileName
* read current attributes for this file * read current attributes for this file
dwFileAttributes = GetFileAttributes(tcFileName) dwFileAttributes = fb2p_GetFileAttributes(tcFileName)
IF dwFileAttributes = -1 IF dwFileAttributes = -1
* the file does not exist * the file does not exist
RETURN EXIT
ENDIF
IF dwFileAttributes > 0
IF '+R' $ tcAttrib
dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_READONLY)
ENDIF
IF '+A' $ tcAttrib
dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_ARCHIVE)
ENDIF
IF '+S' $ tcAttrib
dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_SYSTEM)
ENDIF
IF '+H' $ tcAttrib
dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_HIDDEN)
ENDIF
IF '+D' $ tcAttrib
dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_DIRECTORY)
ENDIF
IF '+N' $ tcAttrib
dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_NORMAL)
ENDIF
IF '+T' $ tcAttrib
dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_TEMPORARY)
ENDIF
IF '+C' $ tcAttrib
dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_COMPRESSED)
ENDIF ENDIF
IF '-R' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_READONLY) = FILE_ATTRIBUTE_READONLY IF dwFileAttributes > 0
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_READONLY IF '+R' $ tcAttrib
ENDIF dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_READONLY)
IF '-A' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_ARCHIVE) = FILE_ATTRIBUTE_ARCHIVE ENDIF
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_ARCHIVE IF '+A' $ tcAttrib
ENDIF dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_ARCHIVE)
IF '-S' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_SYSTEM) = FILE_ATTRIBUTE_SYSTEM ENDIF
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_SYSTEM IF '+S' $ tcAttrib
ENDIF dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_SYSTEM)
IF '-H' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_HIDDEN) = FILE_ATTRIBUTE_HIDDEN ENDIF
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_HIDDEN IF '+H' $ tcAttrib
ENDIF dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_HIDDEN)
IF '-D' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_DIRECTORY) = FILE_ATTRIBUTE_DIRECTORY ENDIF
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_DIRECTORY IF '+D' $ tcAttrib
ENDIF dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_DIRECTORY)
IF '-N' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_NORMAL) = FILE_ATTRIBUTE_NORMAL ENDIF
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_NORMAL IF '+N' $ tcAttrib
ENDIF dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_NORMAL)
IF '-T' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_TEMPORARY) = FILE_ATTRIBUTE_TEMPORARY ENDIF
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_TEMPORARY IF '+T' $ tcAttrib
ENDIF dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_TEMPORARY)
IF '-C' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_COMPRESSED) = FILE_ATTRIBUTE_COMPRESSED ENDIF
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_COMPRESSED IF '+C' $ tcAttrib
dwFileAttributes = BITOR(dwFileAttributes, FILE_ATTRIBUTE_COMPRESSED)
ENDIF
IF '-R' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_READONLY) = FILE_ATTRIBUTE_READONLY
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_READONLY
ENDIF
IF '-A' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_ARCHIVE) = FILE_ATTRIBUTE_ARCHIVE
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_ARCHIVE
ENDIF
IF '-S' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_SYSTEM) = FILE_ATTRIBUTE_SYSTEM
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_SYSTEM
ENDIF
IF '-H' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_HIDDEN) = FILE_ATTRIBUTE_HIDDEN
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_HIDDEN
ENDIF
IF '-D' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_DIRECTORY) = FILE_ATTRIBUTE_DIRECTORY
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_DIRECTORY
ENDIF
IF '-N' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_NORMAL) = FILE_ATTRIBUTE_NORMAL
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_NORMAL
ENDIF
IF '-T' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_TEMPORARY) = FILE_ATTRIBUTE_TEMPORARY
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_TEMPORARY
ENDIF
IF '-C' $ tcAttrib AND BITAND(dwFileAttributes, FILE_ATTRIBUTE_COMPRESSED) = FILE_ATTRIBUTE_COMPRESSED
dwFileAttributes = dwFileAttributes - FILE_ATTRIBUTE_COMPRESSED
ENDIF
* setting selected attributes
=fb2p_SetFileAttributes(tcFileName, dwFileAttributes)
ENDIF ENDIF
* setting selected attributes CATCH TO loEx
=SetFileAttributes(tcFileName, dwFileAttributes) THROW
ENDIF
FINALLY
CLEAR DLLS 'fb2p_SetFileAttributes', 'fb2p_GetFileAttributes'
ENDTRY
RETURN
ENDPROC ENDPROC
@@ -760,7 +784,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
WITH THIS AS c_foxbin2prg OF 'FOXBIN2PRG.PRG' WITH THIS AS c_foxbin2prg OF 'FOXBIN2PRG.PRG'
IF NOT .l_ConfigEvaluated IF NOT .l_ConfigEvaluated
lcConfigFile = THIS.c_Foxbin2prg_ConfigFile lcConfigFile = .c_Foxbin2prg_ConfigFile
llExisteConfig = FILE( lcConfigFile ) llExisteConfig = FILE( lcConfigFile )
IF llExisteConfig IF llExisteConfig
@@ -1900,8 +1924,8 @@ DEFINE CLASS c_conversor_base AS SESSION
PROCEDURE DESTROY PROCEDURE DESTROY
C_FB2PRG_CODE = '' C_FB2PRG_CODE = ''
USE IN (SELECT("TABLABIN")) USE IN (SELECT("TABLABIN"))
THIS.writeLog( C_CONVERTER_UNLOAD_LOC ) THIS.writeLog( C_CONVERTER_UNLOAD_LOC )
THIS.oFSO = NULL
ENDPROC ENDPROC
@@ -2146,7 +2170,7 @@ DEFINE CLASS c_conversor_base AS SESSION
ENDCASE ENDCASE
RETURN tcValue RETURN tcValue
ENDFUNC ENDPROC
******************************************************************************************************************* *******************************************************************************************************************
@@ -2300,7 +2324,7 @@ DEFINE CLASS c_conversor_base AS SESSION
ENDTRY ENDTRY
RETURN lcTimeStamp_Ret RETURN lcTimeStamp_Ret
ENDPROC ENDFUNC
PROCEDURE get_SeparatedLineAndComment PROCEDURE get_SeparatedLineAndComment