Favourites are now stored db-independent

Author: patrickTingen

DataDigger.i

@@ -72,8 +72,7 @@ DEFINE TEMP-TABLE ttTable NO-UNDO RCODE-INFORMATION
   FIELD lCached       AS LOGICAL   LABEL "" /* for preCaching */
   FIELD iFileNumber   AS INTEGER   LABEL "_File-Number"
   FIELD cCategory     AS CHARACTER LABEL "Category"
-  FIELD lFavourite    AS LOGICAL   LABEL "" /* favourite table */
-  FIELD cFavourites   AS CHARACTER LABEL "" /* favourite groups */
+  FIELD lFavourite    AS LOGICAL   LABEL "" /* for editing favourites */
   INDEX idxPrim IS PRIMARY cDatabase cTableName
   INDEX idxSec cTableName
   .
@@ -277,7 +276,8 @@ DEFINE TEMP-TABLE ttQuerySort NO-UNDO RCODE-INFORMATION
 
 /* TT for favourite groups */
 DEFINE TEMP-TABLE ttFavGroup NO-UNDO RCODE-INFORMATION
-  FIELD cGroup AS CHARACTER
+  FIELD cGroup  AS CHARACTER
+  FIELD cTables AS CHARACTER
   INDEX iPrim IS PRIMARY cGroup
   .
 

DataDigger.txt

@@ -54,6 +54,7 @@ DataDigger version 25
 - Change: Save-as Excel file now uses .xlsx format instead of .xls
 - Change: Removed unused tracking of DD functions
 - Change: Minimum window size much smaller now
+- Change: Favourites are now stored db-independent
 
 - New   : Option to change window title via myDataDigger.p (Johan Geerts)
 - New   : Generate dump/load: toggle for selected fields only (Dirk Vreken)

DataDiggerLib.p

@@ -718,7 +718,7 @@ FUNCTION setRegistry RETURNS CHARACTER
 &ANALYZE-SUSPEND _CREATE-WINDOW
 /* DESIGN Window definition (used by the UIB) 
   CREATE WINDOW Procedure ASSIGN
-         HEIGHT             = 24.91
+         HEIGHT             = 30.19
          WIDTH              = 53.4.
 /* END WINDOW DEFINITION */
                                                                         */
@@ -1658,6 +1658,43 @@ END PROCEDURE. /* getDumpFileName */
 
 &ENDIF
 
+&IF DEFINED(EXCLUDE-getFavourites) = 0 &THEN
+
+&ANALYZE-SUSPEND _UIB-CODE-BLOCK _PROCEDURE getFavourites Procedure 
+PROCEDURE getFavourites :
+/* Extract favourites from config table into own tt
+*/
+  DEFINE OUTPUT PARAMETER TABLE FOR ttFavGroup.
+
+  DEFINE BUFFER bfConfig   FOR ttConfig.
+  DEFINE BUFFER btFavGroup FOR ttFavGroup.
+
+  EMPTY TEMP-TABLE ttFavGroup.
+
+  FOR EACH bfConfig
+    WHERE bfConfig.cSection = 'DataDigger:Favourites'
+      AND bfConfig.cSetting > "":
+
+    CREATE btFavGroup.
+    ASSIGN 
+      btFavGroup.cGroup  = bfConfig.cSetting
+      btFavGroup.cTables = bfConfig.cValue.
+  END. 
+
+  /* If no groups are found, create a default one */
+  IF NOT CAN-FIND(FIRST btFavGroup) THEN
+  DO:
+    CREATE btFavGroup.
+    ASSIGN btFavGroup.cGroup = 'MyFavourites'.
+  END.
+
+END PROCEDURE. /* getFavourites */
+
+/* _UIB-CODE-BLOCK-END */
+&ANALYZE-RESUME
+
+&ENDIF
+
 &IF DEFINED(EXCLUDE-getFields) = 0 &THEN
 
 &ANALYZE-SUSPEND _UIB-CODE-BLOCK _PROCEDURE getFields Procedure 
@@ -2427,18 +2464,6 @@ PROCEDURE getTableStats :
 
     END. /* lastUsed */
 
-    ELSE
-    IF cLine MATCHES "*:Favourites=*" THEN
-    DO:
-      FIND FIRST ttTable
-        WHERE ttTable.cDatabase = cDatabase
-          AND ttTable.cTableName = ENTRY(1,cLine,':') NO-ERROR.
-
-      IF AVAILABLE ttTable THEN
-        ttTable.cFavourites = ENTRY(2,cLine,'=') NO-ERROR.
-
-    END. /* favourite */
-
   END. /* repeat */
   INPUT CLOSE.
 
@@ -3072,6 +3097,47 @@ END PROCEDURE. /* setCaching */
 
 &ENDIF
 
+&IF DEFINED(EXCLUDE-setFavourite) = 0 &THEN
+
+&ANALYZE-SUSPEND _UIB-CODE-BLOCK _PROCEDURE setFavourite Procedure 
+PROCEDURE setFavourite :
+/* Set / unset / toggle a table as favourite
+*/
+  DEFINE INPUT PARAMETER pcTable     AS CHARACTER NO-UNDO.
+  DEFINE INPUT PARAMETER pcGroupName AS CHARACTER NO-UNDO.
+  DEFINE INPUT PARAMETER plFavourite AS LOGICAL   NO-UNDO.
+
+  DEFINE VARIABLE i     AS INTEGER   NO-UNDO.
+  DEFINE VARIABLE cList AS CHARACTER NO-UNDO.
+
+  cList = getRegistry("DataDigger:Favourites", pcGroupName).
+  IF cList = ? THEN cList = ''.
+  i = LOOKUP(pcTable, cList).
+
+  /* Toggle setting? */
+  IF plFavourite = ? THEN plFavourite = (i = 0).
+
+  /* Add to favourites */
+  IF NOT plFavourite AND i > 0 THEN 
+  DO:
+    ENTRY(i, cList) = ''.
+    cList = REPLACE(cList,',,',',').
+    cList = TRIM(cList,',').
+  END.
+
+  /* Remove from favourites */
+  IF plFavourite AND i = 0 THEN 
+    cList = TRIM(SUBSTITUTE('&1,&2', cList, pcTable),',').
+
+  setRegistry("DataDigger:Favourites", pcGroupName, cList).
+
+END PROCEDURE. /* setFavourite */
+
+/* _UIB-CODE-BLOCK-END */
+&ANALYZE-RESUME
+
+&ENDIF
+
 &IF DEFINED(EXCLUDE-setLabelPosition) = 0 &THEN
 
 &ANALYZE-SUSPEND _UIB-CODE-BLOCK _PROCEDURE setLabelPosition Procedure 
@@ -5068,4 +5134,3 @@ END FUNCTION. /* setRegistry */
 &ANALYZE-RESUME
 
 &ENDIF
-

build.i

@@ -1 +1 @@
-20191219
+20201109