Skip to content

Commit

Permalink
Error in conversion routine
Browse files Browse the repository at this point in the history
  • Loading branch information
@patrickTingen
patrickTingen committed Dec 18, 2020
1 parent 2cb734c commit 645045d
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion DataDigger.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/*----------------------------------------------------------------------*/

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

&GLOBAL-DEFINE QUERYSEP CHR(1, SESSION:CPINTERNAL, "UTF-8")
Expand Down
2 changes: 1 addition & 1 deletion convertSettings.p
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ DEFINE INPUT PARAMETER piOldVersion AS INTEGER NO-UNDO.

SESSION:SET-WAIT-STATE("general").

RUN VALUE(SUBSTITUTE('ConvertFrom-&1', piOldVersion)).
RUN VALUE(SUBSTITUTE('ConvertFrom-&1', piOldVersion)) NO-ERROR.
RUN flushRegistry.

SESSION:SET-WAIT-STATE("").
Expand Down
134 changes: 67 additions & 67 deletions wDataDigger.w
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@ DEFINE VARIABLE glUseColorsFavouriteTable AS LOGICAL NO-UNDO.
&Scoped-Define ENABLED-OBJECTS rctQuery rctEdit fiTableFilter ~
cbDatabaseFilter btnFavourite tgSelAll fiIndexNameFilter fiFlagsFilter ~
fiFieldsFilter btnClearIndexFilter brTables brFields brIndexes tgDebugMode ~
fiTableDesc cbFavouriteGroup ficWhere btnClearTableFilter btnTableFilter ~
btnAddFavGroup btnWhere btnQueries btnView btnTools btnTabTables btnClear ~
btnClearFieldFilter btnClipboard btnMoveBottom btnMoveDown btnMoveTop ~
btnMoveUp btnReset btnTabFavourites btnTabFields btnTabIndexes btnNextQuery ~
btnPrevQuery btnDump btnLoad btnDelete btnResizeVer btnClone btnAdd btnEdit ~
fiFeedback
btnClearTableFilter btnTableFilter btnAddFavGroup fiTableDesc ~
cbFavouriteGroup btnWhere ficWhere btnQueries btnView btnTools btnTabTables ~
btnClear btnClearFieldFilter btnClipboard btnMoveBottom btnMoveDown ~
btnMoveTop btnMoveUp btnReset btnTabFavourites btnTabFields btnTabIndexes ~
btnNextQuery btnPrevQuery btnDump btnLoad btnDelete btnResizeVer btnClone ~
btnAdd btnEdit fiFeedback
&Scoped-Define DISPLAYED-OBJECTS fiTableFilter cbDatabaseFilter tgSelAll ~
fiIndexNameFilter fiFlagsFilter fiFieldsFilter fiTableDesc cbFavouriteGroup ~
ficWhere fiFeedback
Expand Down Expand Up @@ -1000,17 +1000,17 @@ DEFINE FRAME frMain
brFields AT Y 27 X 325 WIDGET-ID 100
brIndexes AT Y 28 X 829 WIDGET-ID 200
tgDebugMode AT Y 29 X 38 WIDGET-ID 238 NO-TAB-STOP
fiTableDesc AT Y 236 X 57 NO-LABEL WIDGET-ID 90
cbFavouriteGroup AT Y 236 X 75 COLON-ALIGNED NO-LABEL WIDGET-ID 316
ficWhere AT Y 266 X 80 NO-LABEL
fiWarning AT Y 520 X 480 COLON-ALIGNED NO-LABEL WIDGET-ID 172
btnClearTableFilter AT Y 3 X 237 WIDGET-ID 222
btnTableFilter AT Y 3 X 257 WIDGET-ID 38
btnAddFavGroup AT Y 236 X 248 WIDGET-ID 318
fiTableDesc AT Y 236 X 57 NO-LABEL WIDGET-ID 90
cbFavouriteGroup AT Y 236 X 75 COLON-ALIGNED NO-LABEL WIDGET-ID 316
btnWhere AT Y 265 X 683 WIDGET-ID 236
ficWhere AT Y 266 X 80 NO-LABEL
btnQueries AT Y 265 X 745 WIDGET-ID 190
btnView AT Y 520 X 200 WIDGET-ID 4
btnTools AT Y 0 X 1 WIDGET-ID 264
fiWarning AT Y 520 X 480 COLON-ALIGNED NO-LABEL WIDGET-ID 172
btnTabTables AT Y 45 X 34 WIDGET-ID 300
btnClear AT Y 265 X 725 WIDGET-ID 30
btnClearFieldFilter AT Y 5 X 765 WIDGET-ID 232
Expand Down Expand Up @@ -1044,17 +1044,46 @@ DEFINE FRAME frMain
AT X 0 Y 0
SIZE-PIXELS 1498 BY 560 DROP-TARGET.

DEFINE FRAME frData
btnClearDataFilter AT Y 5 X 761 WIDGET-ID 76
btnDataSort AT Y 4 X 5 WIDGET-ID 300
fiNumSelected AT Y 198 X 636 COLON-ALIGNED NO-LABEL WIDGET-ID 298
fiNumRecords AT Y 198 X 665 COLON-ALIGNED NO-LABEL WIDGET-ID 210
rctData AT Y 0 X 0 WIDGET-ID 272
rctDataFilter AT Y 1 X 0 WIDGET-ID 296
DEFINE FRAME frSettings
btnQueries-txt AT Y 175 X 37 WIDGET-ID 294
btnDataDigger AT Y 35 X 1 WIDGET-ID 126
btnSettings AT Y 70 X 1 WIDGET-ID 210
btnDict AT Y 105 X 1 WIDGET-ID 224
btnDataAdmin AT Y 140 X 1 WIDGET-ID 214
btnQueries-3 AT Y 175 X 1 WIDGET-ID 190
btnQueryTester AT Y 210 X 1 WIDGET-ID 232
btnConnections AT Y 245 X 1 WIDGET-ID 212
btnEditor AT Y 280 X 1 WIDGET-ID 228
btnHelp AT Y 315 X 1 WIDGET-ID 260
btnAbout AT Y 350 X 1 WIDGET-ID 196
btnExpand AT Y 485 X 1 WIDGET-ID 306
btnExpand-txt AT Y 485 X 35 WIDGET-ID 308
btnEditor-txt AT Y 280 X 37 WIDGET-ID 290
btnQueryTester-txt AT Y 210 X 37 WIDGET-ID 298
btnAbout-txt AT Y 350 X 37 WIDGET-ID 266
btnConnections-txt AT Y 245 X 37 WIDGET-ID 270
btnDataAdmin-txt AT Y 140 X 37 WIDGET-ID 274
btnDataDigger-txt AT Y 35 X 37 WIDGET-ID 278
btnHelp-txt AT Y 315 X 37 WIDGET-ID 286
btnSettings-txt AT Y 70 X 37 WIDGET-ID 302
btnTools-2 AT Y 0 X 1 WIDGET-ID 264
btnDict-txt AT Y 105 X 37 WIDGET-ID 282
btnTools-txt AT Y 0 X 35 WIDGET-ID 304
WITH 1 DOWN NO-BOX KEEP-TAB-ORDER OVERLAY
SIDE-LABELS NO-UNDERLINE THREE-D
AT COL 7 ROW 15.05
SIZE 158 BY 10.24 WIDGET-ID 700.
SIDE-LABELS NO-UNDERLINE
AT COL 1 ROW 2.43
SIZE 28 BY 24.76
BGCOLOR 15 WIDGET-ID 500.

DEFINE FRAME frHint
edHint AT Y 4 X 35 NO-LABEL WIDGET-ID 2
btGotIt AT Y 110 X 104 WIDGET-ID 4
imgArrow AT Y 0 X 0 WIDGET-ID 10
WITH 1 DOWN KEEP-TAB-ORDER OVERLAY
SIDE-LABELS TOP-ONLY NO-UNDERLINE THREE-D
AT X 1150 Y 15
SIZE-PIXELS 285 BY 140
BGCOLOR 14 WIDGET-ID 600.

DEFINE FRAME frWhere
btnBegins AT Y 123 X 17 WIDGET-ID 74
Expand Down Expand Up @@ -1092,46 +1121,17 @@ DEFINE FRAME frWhere
TITLE "Query Editor"
DEFAULT-BUTTON btnOK WIDGET-ID 400.

DEFINE FRAME frHint
edHint AT Y 4 X 35 NO-LABEL WIDGET-ID 2
btGotIt AT Y 110 X 104 WIDGET-ID 4
imgArrow AT Y 0 X 0 WIDGET-ID 10
WITH 1 DOWN KEEP-TAB-ORDER OVERLAY
SIDE-LABELS TOP-ONLY NO-UNDERLINE THREE-D
AT X 1150 Y 15
SIZE-PIXELS 285 BY 140
BGCOLOR 14 WIDGET-ID 600.

DEFINE FRAME frSettings
btnQueries-txt AT Y 175 X 37 WIDGET-ID 294
btnDataDigger AT Y 35 X 1 WIDGET-ID 126
btnSettings AT Y 70 X 1 WIDGET-ID 210
btnDict AT Y 105 X 1 WIDGET-ID 224
btnDataAdmin AT Y 140 X 1 WIDGET-ID 214
btnQueries-3 AT Y 175 X 1 WIDGET-ID 190
btnQueryTester AT Y 210 X 1 WIDGET-ID 232
btnConnections AT Y 245 X 1 WIDGET-ID 212
btnEditor AT Y 280 X 1 WIDGET-ID 228
btnHelp AT Y 315 X 1 WIDGET-ID 260
btnAbout AT Y 350 X 1 WIDGET-ID 196
btnExpand AT Y 485 X 1 WIDGET-ID 306
btnExpand-txt AT Y 485 X 35 WIDGET-ID 308
btnEditor-txt AT Y 280 X 37 WIDGET-ID 290
btnQueryTester-txt AT Y 210 X 37 WIDGET-ID 298
btnAbout-txt AT Y 350 X 37 WIDGET-ID 266
btnConnections-txt AT Y 245 X 37 WIDGET-ID 270
btnDataAdmin-txt AT Y 140 X 37 WIDGET-ID 274
btnDataDigger-txt AT Y 35 X 37 WIDGET-ID 278
btnHelp-txt AT Y 315 X 37 WIDGET-ID 286
btnSettings-txt AT Y 70 X 37 WIDGET-ID 302
btnTools-2 AT Y 0 X 1 WIDGET-ID 264
btnDict-txt AT Y 105 X 37 WIDGET-ID 282
btnTools-txt AT Y 0 X 35 WIDGET-ID 304
DEFINE FRAME frData
btnClearDataFilter AT Y 5 X 761 WIDGET-ID 76
btnDataSort AT Y 4 X 5 WIDGET-ID 300
fiNumSelected AT Y 198 X 636 COLON-ALIGNED NO-LABEL WIDGET-ID 298
fiNumRecords AT Y 198 X 665 COLON-ALIGNED NO-LABEL WIDGET-ID 210
rctData AT Y 0 X 0 WIDGET-ID 272
rctDataFilter AT Y 1 X 0 WIDGET-ID 296
WITH 1 DOWN NO-BOX KEEP-TAB-ORDER OVERLAY
SIDE-LABELS NO-UNDERLINE
AT COL 1 ROW 2.43
SIZE 28 BY 24.76
BGCOLOR 15 WIDGET-ID 500.
SIDE-LABELS NO-UNDERLINE THREE-D
AT COL 7 ROW 15.05
SIZE 158 BY 10.24 WIDGET-ID 700.


/* *********************** Procedure Settings ************************ */
Expand Down Expand Up @@ -6771,13 +6771,13 @@ PROCEDURE enable_UI :
WITH FRAME frMain IN WINDOW C-Win.
ENABLE rctQuery rctEdit fiTableFilter cbDatabaseFilter btnFavourite tgSelAll
fiIndexNameFilter fiFlagsFilter fiFieldsFilter btnClearIndexFilter
brTables brFields brIndexes tgDebugMode fiTableDesc cbFavouriteGroup
ficWhere btnClearTableFilter btnTableFilter btnAddFavGroup btnWhere
btnQueries btnView btnTools btnTabTables btnClear btnClearFieldFilter
btnClipboard btnMoveBottom btnMoveDown btnMoveTop btnMoveUp btnReset
btnTabFavourites btnTabFields btnTabIndexes btnNextQuery btnPrevQuery
btnDump btnLoad btnDelete btnResizeVer btnClone btnAdd btnEdit
fiFeedback
brTables brFields brIndexes tgDebugMode btnClearTableFilter
btnTableFilter btnAddFavGroup fiTableDesc cbFavouriteGroup btnWhere
ficWhere btnQueries btnView btnTools btnTabTables btnClear
btnClearFieldFilter btnClipboard btnMoveBottom btnMoveDown btnMoveTop
btnMoveUp btnReset btnTabFavourites btnTabFields btnTabIndexes
btnNextQuery btnPrevQuery btnDump btnLoad btnDelete btnResizeVer
btnClone btnAdd btnEdit fiFeedback
WITH FRAME frMain IN WINDOW C-Win.
{&OPEN-BROWSERS-IN-QUERY-frMain}
DISPLAY edHint
Expand Down Expand Up @@ -12507,9 +12507,9 @@ PROCEDURE startSession :
SESSION:SET-WAIT-STATE("general").
convLoop:
REPEAT:
IF iVersion >= {&VERSION} THEN LEAVE convLoop.
RUN VALUE(getProgramDir() + 'convertSettings.p')(iVersion).
iVersion = iVersion + 1.
IF iVersion >= {&VERSION} THEN LEAVE convLoop.
END.
DELETE OBJECT hWindow.
SESSION:SET-WAIT-STATE("").
Expand Down
Binary file modified wDataDigger.wrx
View file
Binary file not shown.

0 comments on commit 645045d

Please sign in to comment.