Skip to content

Commit 4a069c6

Browse files
committed
Failed to start in v10
1 parent b962983 commit 4a069c6

5 files changed

Lines changed: 24 additions & 5 deletions

File tree

DataDigger.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/*----------------------------------------------------------------------*/
1212

1313
&GLOBAL-DEFINE version {version.i}
14-
&GLOBAL-DEFINE edition Rudolf
14+
&GLOBAL-DEFINE edition Ironman
1515
&GLOBAL-DEFINE build {build.i}
1616

1717
&GLOBAL-DEFINE QUERYSEP CHR(2, SESSION:CPINTERNAL, "UTF-8")

DataDigger.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
=====================================================================================
88

9-
DataDigger version 26
9+
DataDigger version 26 - 19 may 2022 (Iron Man)
1010

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

3132
- Changed: Starting the libraries is simplified, contact me when you have errors
3233
- Changed: When dumping to Excel, assume codepage 1252 when current is ISO8859

DataDigger2.p

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,10 @@ PROCEDURE recompileSelf :
591591
PUT UNFORMATTED SKIP(0) " Windows version : " SESSION:WINDOW-SYSTEM " " cSystem + ", " getProcessorArchitecture() "bit".
592592
PUT UNFORMATTED SKIP(0) " System memory : " cMemory.
593593
PUT UNFORMATTED SKIP(0) " Display size : " SESSION:WORK-AREA-WIDTH-PIXELS " x " SESSION:WORK-AREA-HEIGHT-PIXELS.
594+
595+
&IF PROVERSION >= "11" &THEN
594596
PUT UNFORMATTED SKIP(0) " Logged in as : " System.Environment:GetEnvironmentVariable("username").
597+
&ENDIF
595598

596599
PUT UNFORMATTED SKIP(1) "SESSION INFO".
597600
PUT UNFORMATTED SKIP(0) " Program dir : " gcProgramDir.

DataDiggerLib.p

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5056,9 +5056,19 @@ FUNCTION resolveOsVars RETURNS CHARACTER
50565056
DEFINE VARIABLE i AS INTEGER NO-UNDO.
50575057

50585058
DO i = 1 TO NUM-ENTRIES(pcString,'%'):
5059+
5060+
&IF PROVERSION < "11" &THEN
5061+
/* Old style for v10 */
5062+
IF i MODULO 2 = 0
5063+
AND OS-GETENV(ENTRY(i,pcString,'%')) <> ? THEN
5064+
ENTRY(i,pcString,'%') = OS-GETENV(ENTRY(i,pcString,'%')).
5065+
5066+
&ELSE
5067+
50595068
IF i MODULO 2 = 0
50605069
AND System.Environment:GetEnvironmentVariable(ENTRY(i,pcString,'%')) <> ? THEN
50615070
ENTRY(i,pcString,'%') = System.Environment:GetEnvironmentVariable(ENTRY(i,pcString,'%')).
5071+
&ENDIF
50625072
END.
50635073

50645074
pcString = REPLACE(pcString,'%','').

dCloneDatabase.w

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,15 @@ PROCEDURE cloneDatabase :
275275
RETURN.
276276
END.
277277

278-
cDlc = System.Environment:GetEnvironmentVariable('DLC':U).
278+
&IF PROVERSION < "11" &THEN
279+
cDlc = OS-GETENV('DLC').
280+
&ELSE
281+
cDlc = System.Environment:GetEnvironmentVariable('DLC').
282+
&ENDIF
283+
279284
IF cDlc = ? THEN
280-
ASSIGN cDlc = SEARCH('empty.db':U)
281-
cDlc = SUBSTRING(cDlc,1,LENGTH(cDlc,'CHARACTER':U) - 9,'CHARACTER':U).
285+
ASSIGN cDlc = SEARCH('empty.db')
286+
cDlc = SUBSTRING(cDlc,1,LENGTH(cDlc,'CHARACTER') - 9,'CHARACTER').
282287

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

0 commit comments

Comments
 (0)