Merge pull request #91 from patrickTingen/develop

DD26
patrickTingen · May 30, 2022 · 03f87af · 03f87af
2 parents 36d48bf + 4a069c6
commit 03f87af
Show file tree

Hide file tree

Showing 51 changed files with 3,306 additions and 3,757 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,4 @@ protrace*
 empty_schema.df
 
 /results.xml
+/.vs
diff --git a/DataDigger.i b/DataDigger.i
@@ -11,13 +11,13 @@
 /*----------------------------------------------------------------------*/
 
 &GLOBAL-DEFINE version {version.i}
-&GLOBAL-DEFINE edition Rudolf
+&GLOBAL-DEFINE edition Ironman
 &GLOBAL-DEFINE build {build.i}
 
-&GLOBAL-DEFINE QUERYSEP CHR(1, SESSION:CPINTERNAL, "UTF-8")
+&GLOBAL-DEFINE QUERYSEP CHR(2, SESSION:CPINTERNAL, "UTF-8")
 
 /* Maximum field length for editing char fields */
-&GLOBAL-DEFINE field-maxLength 200
+&GLOBAL-DEFINE field-maxLength 2000
 
 /* FINALLY statement was introduced in 10.1C */
 &IF PROVERSION >= "10.1C" AND DEFINED(UIB_IS_RUNNING) = 0 &THEN
@@ -49,8 +49,6 @@
   &GLOBAL-DEFINE TABLE-SCAN TABLE-SCAN
 &ENDIF
 
-DEFINE VARIABLE gcThisProcedure AS CHARACTER   NO-UNDO.
-
 /* TT for field data to link DataDiggers to each other */
 DEFINE TEMP-TABLE ttLinkInfo NO-UNDO
   FIELD cField AS CHARACTER
@@ -101,15 +99,15 @@ DEFINE TEMP-TABLE ttField NO-UNDO
 
   FIELD cFullName     AS CHARACTER                   LABEL "Name"      FORMAT "X(40)"    /* fieldname incl extent     */
   FIELD cXmlNodeName  AS CHARACTER                   LABEL "Xml Name"  FORMAT "X(40)"    /* name for usage in XML     */
-  FIELD iOrder        AS DECIMAL                     LABEL "Order"     FORMAT ">>>>>9"   /* user defined order        */
+  FIELD iOrder        AS INTEGER                     LABEL "Order"     FORMAT ">>>>>9"   /* user defined order        */
   FIELD lShow         AS LOGICAL                     LABEL ""                            /* toggle box                */
   FIELD cDataType     AS CHARACTER                   LABEL "Type"      FORMAT "X(16)"
   FIELD cInitial      AS CHARACTER                   LABEL "Initial"                     /* initial value from dict   */
   FIELD cFormat       AS CHARACTER                   LABEL "Format"    FORMAT "X(80)"    /* user defined format       */
   FIELD cFormatOrg    AS CHARACTER                   LABEL "Format"                      /* original format           */
   FIELD iWidth        AS INTEGER                     LABEL "Width"                       /* SQL width                 */
   FIELD cLabel        AS CHARACTER                   LABEL "Label"     FORMAT "X(50)"
-  FIELD iOrderOrg     AS DECIMAL                                                         /* original order            */
+  FIELD iOrderOrg     AS INTEGER                                                         /* original order            */
   FIELD iExtent       AS INTEGER                     LABEL "Extent"    FORMAT ">>>>9"
   FIELD lPrimary      AS LOGICAL                     LABEL "Prim"                        /* part of prim index?       */
   FIELD lMandatory    AS LOGICAL                     LABEL "Man"                         /* mandatory?                */
@@ -176,7 +174,7 @@ DEFINE TEMP-TABLE ttColumnCache NO-UNDO LIKE ttColumn
 DEFINE DATASET dsFields FOR ttField, ttColumn.
 DEFINE DATASET dsFieldCache FOR ttFieldCache, ttColumnCache.
 
-/* TT for the indexfields of a table */
+/* TT for the index fields of a table */
 DEFINE TEMP-TABLE ttIndex NO-UNDO
   FIELD cIndexName   AS CHARACTER          LABEL "Name"        FORMAT "x(20)"
   FIELD cIndexFlags  AS CHARACTER          LABEL "Flags"       FORMAT "x(14)"
@@ -470,6 +468,9 @@ FUNCTION isDefaultFontsChanged RETURNS LOGICAL IN SUPER.
 FUNCTION isFileLocked RETURNS LOGICAL
   ( pcFileName AS CHARACTER ) IN SUPER.
 
+FUNCTION isIndexActive RETURNS LOGICAL
+  ( pcFile AS CHARACTER, pcIndex AS CHARACTER ) IN SUPER.
+
 FUNCTION isMouseOver RETURNS LOGICAL
   ( INPUT phWidget AS HANDLE ) IN SUPER.
 
@@ -495,37 +496,13 @@ FUNCTION setLinkInfo RETURNS LOGICAL
   ) IN SUPER.
 
 FUNCTION setRegistry RETURNS CHARACTER
-    ( pcSection AS CHARACTER
-    , pcKey     AS CHARACTER
-    , pcValue   AS CHARACTER
-    ) IN SUPER.
+  ( pcSection AS CHARACTER
+  , pcKey     AS CHARACTER
+  , pcValue   AS CHARACTER
+  ) IN SUPER.
 
 FUNCTION isValidCodePage RETURNS LOGICAL
-  (pcCodepage AS CHARACTER) IN SUPER.
-
-/* Initialize */
-gcThisProcedure = THIS-PROCEDURE:FILE-NAME.
-gcThisProcedure = ENTRY(NUM-ENTRIES(gcThisProcedure,"\"),gcThisProcedure,"\").
-gcThisProcedure = ENTRY(1,gcThisProcedure,".").
-
-SUBSCRIBE TO gcThisProcedure ANYWHERE RUN-PROCEDURE "getProcHandle".
-
-/* _UIB-CODE-BLOCK-END */
-&ANALYZE-RESUME
-
-
-/* **********************  Internal Procedures  *********************** */
-
-&ANALYZE-SUSPEND _UIB-CODE-BLOCK _PROCEDURE getProcHandle Include 
-PROCEDURE getProcHandle :
-/*
- * Name : getProcHandle
- * Desc : Return the handle of the procedure this include is in
- */
-DEFINE OUTPUT PARAMETER phHandle AS HANDLE NO-UNDO.
-phHandle = THIS-PROCEDURE:HANDLE.
-
-END PROCEDURE. /* getProcHandle */
+  ( pcCodepage AS CHARACTER ) IN SUPER.
 
 /* _UIB-CODE-BLOCK-END */
 &ANALYZE-RESUME
diff --git a/DataDigger.txt b/DataDigger.txt
@@ -6,7 +6,36 @@
 
 =====================================================================================
 
-DataDigger version 25
+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
+- New   : Option to set border color via myDataDigger.p (Johan Geerts)
+- New   : Automagically complete query with missing quotes #74 (Johan Geerts)
+
+- Solved: Call-stack error on getCursorPos (Jay Farr)
+- Solved: Window position not saved on exit (Johan Geerts)
+- Solved: Shift-del does not work in query editor
+- Solved: Generate include fails when all labels are undefined #77 (Dirk Vreken)
+- Solved: Generate include file abbreviates table name when longer than 20 chars #78 (Dirk Vreken)
+- Solved: CTRL-A or CTRL-D on empty browse gives error #76
+- Solved: Export to 4GL does not escape curly braces #80 (Rob Willoughby)
+- Solved: Data dictionary no longer resizable #81 (Dirk Vreken)
+- Solved: Error when downloading file
+- Solved: Error when starting datadigger with UTF-8 and windows username with special characters #84 (movedoa)
+- Solved: Function resolveOsVars is returning invalid values with cpinternal UTF-8 #85 (movedoa)
+- 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
+- Changed: All widget-id attributes removed from UI elements #82 (Simi Slegian)
+
+=====================================================================================
+
+DataDigger version 25 - 29 dec 2020 (Rudolf)
 
 - Solved: Error when deleting record while in edit mode (Johan Geerts)
 - Solved: User defined color '?' was reset to default value after restart

diff --git a/DataDigger2.p b/DataDigger2.p
@@ -406,7 +406,7 @@ PROCEDURE initializeObject :
       SKIP "Please download and reinstall DataDigger again" 
       SKIP(1) "The program will now quit"
            VIEW-AS ALERT-BOX INFORMATION.
-    OS-COMMAND NO-WAIT START VALUE("https://datadigger.wordpress.com/download/").
+    OS-COMMAND NO-WAIT VALUE("START https://datadigger.wordpress.com/download/").
     QUIT.
   END.
 
@@ -475,7 +475,7 @@ PROCEDURE recompileDataDigger :
       DO:
         MESSAGE "Cannot create dummy database in folder" cDummyDb SKIP 
                 "DataDigger needs at least 1 connected db to compile." VIEW-AS ALERT-BOX INFORMATION BUTTONS OK.
-        OS-COMMAND NO-WAIT START 'https://github.com/patrickTingen/DataDigger/wiki/Problem-CannotCreateDummyDB'.
+        OS-COMMAND NO-WAIT 'START https://github.com/patrickTingen/DataDigger/wiki/Problem-CannotCreateDummyDB'.
         STOP.
       END.
     END.
@@ -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.
-  PUT UNFORMATTED SKIP(0) "  Logged in as       : " OS-GETENV("username").
+
+  &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.
@@ -721,7 +724,7 @@ PROCEDURE recompileSelf :
   DO:
     MESSAGE "An error occurred while recompiling. ~n~nPlease check 'DataDigger.log' in the DataDigger directory."
       VIEW-AS ALERT-BOX INFORMATION BUTTONS OK.
-    OS-COMMAND NO-WAIT START VALUE(cLogFile).
+    OS-COMMAND NO-WAIT VALUE(SUBSTITUTE("START &1", cLogFile)).
   END.
 
   /* Clean up */
@@ -877,12 +880,13 @@ FUNCTION getTimeStamp RETURNS CHARACTER
   ( INPUT pDateTime AS DATETIME ) :
   /* Return a timestamp in the form "YYYY-MM-DD HH:MM:SS"
   */
+  {&_proparse_ prolint-nowarn(overflow)}
   RETURN
     SUBSTITUTE('&1-&2-&3 &4'
               , STRING(YEAR(pDateTime),'9999')
               , STRING(MONTH(pDateTime),'99')
               , STRING(DAY(pDateTime),'99')
-              , STRING( INTEGER( TRUNCATE( MTIME( pDateTime ) / 1000, 0 ) ),'HH:MM:SS' )
+              , STRING(INTEGER( TRUNCATE( MTIME( pDateTime ) / 1000, 0 ) ),'HH:MM:SS' )
               ).
 
 END FUNCTION. /* getTimeStamp */
@@ -1009,4 +1013,5 @@ END FUNCTION. /* setRegistry */
 /* _UIB-CODE-BLOCK-END */
 &ANALYZE-RESUME
 
-&ENDIF
+&ENDIF
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,3 +34,4 @@ protrace*
		empty_schema.df

		/results.xml
		/.vs