Skip to content

Commit

Permalink
Failed to start in v10
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickTingen committed May 19, 2022
1 parent b962983 commit 4a069c6
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 5 deletions.
2 changes: 1 addition & 1 deletion DataDigger.i
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/*----------------------------------------------------------------------*/

&GLOBAL-DEFINE version {version.i}
&GLOBAL-DEFINE edition Rudolf
&GLOBAL-DEFINE edition Ironman
&GLOBAL-DEFINE build {build.i}

&GLOBAL-DEFINE QUERYSEP CHR(2, SESSION:CPINTERNAL, "UTF-8")
Expand Down
3 changes: 2 additions & 1 deletion DataDigger.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

=====================================================================================

DataDigger version 26
DataDigger version 26 - 19 may 2022 (Iron Man)

- New : Option for abbreviated datatypes in generate temp-table include (Baltazar Oliveira)
- New : Option for abbreviated datatypes in generate active record class
Expand All @@ -27,6 +27,7 @@ DataDigger version 26
- Solved: Cannot type umlaut in filter row #83 (movedoa)
- Solved: Inactivated index shows as active #75
- Solved: Active index shown as inactive #86 (Richard Kelters)
- Solved: Failed to start in v10

- Changed: Starting the libraries is simplified, contact me when you have errors
- Changed: When dumping to Excel, assume codepage 1252 when current is ISO8859
Expand Down
3 changes: 3 additions & 0 deletions DataDigger2.p
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,10 @@ PROCEDURE recompileSelf :
PUT UNFORMATTED SKIP(0) " Windows version : " SESSION:WINDOW-SYSTEM " " cSystem + ", " getProcessorArchitecture() "bit".
PUT UNFORMATTED SKIP(0) " System memory : " cMemory.
PUT UNFORMATTED SKIP(0) " Display size : " SESSION:WORK-AREA-WIDTH-PIXELS " x " SESSION:WORK-AREA-HEIGHT-PIXELS.

&IF PROVERSION >= "11" &THEN
PUT UNFORMATTED SKIP(0) " Logged in as : " System.Environment:GetEnvironmentVariable("username").
&ENDIF

PUT UNFORMATTED SKIP(1) "SESSION INFO".
PUT UNFORMATTED SKIP(0) " Program dir : " gcProgramDir.
Expand Down
10 changes: 10 additions & 0 deletions DataDiggerLib.p
Original file line number Diff line number Diff line change
Expand Up @@ -5056,9 +5056,19 @@ FUNCTION resolveOsVars RETURNS CHARACTER
DEFINE VARIABLE i AS INTEGER NO-UNDO.

DO i = 1 TO NUM-ENTRIES(pcString,'%'):

&IF PROVERSION < "11" &THEN
/* Old style for v10 */
IF i MODULO 2 = 0
AND OS-GETENV(ENTRY(i,pcString,'%')) <> ? THEN
ENTRY(i,pcString,'%') = OS-GETENV(ENTRY(i,pcString,'%')).

&ELSE

IF i MODULO 2 = 0
AND System.Environment:GetEnvironmentVariable(ENTRY(i,pcString,'%')) <> ? THEN
ENTRY(i,pcString,'%') = System.Environment:GetEnvironmentVariable(ENTRY(i,pcString,'%')).
&ENDIF
END.

pcString = REPLACE(pcString,'%','').
Expand Down
11 changes: 8 additions & 3 deletions dCloneDatabase.w
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,15 @@ PROCEDURE cloneDatabase :
RETURN.
END.

cDlc = System.Environment:GetEnvironmentVariable('DLC':U).
&IF PROVERSION < "11" &THEN
cDlc = OS-GETENV('DLC').
&ELSE
cDlc = System.Environment:GetEnvironmentVariable('DLC').
&ENDIF

IF cDlc = ? THEN
ASSIGN cDlc = SEARCH('empty.db':U)
cDlc = SUBSTRING(cDlc,1,LENGTH(cDlc,'CHARACTER':U) - 9,'CHARACTER':U).
ASSIGN cDlc = SEARCH('empty.db')
cDlc = SUBSTRING(cDlc,1,LENGTH(cDlc,'CHARACTER') - 9,'CHARACTER').

/* Point to the proper database */
CREATE ALIAS 'dictdb' FOR DATABASE VALUE(pcDbName).
Expand Down

0 comments on commit 4a069c6

Please sign in to comment.