Changeset 58 for trunk/gui/shared/PrManUtl.VRS

Timestamp:

Jul 15, 2017, 1:19:09 PM (8 years ago)

Author:

Alex Taylor

Message:

Incremented version to 0.7.
Fix population of shipped driver list when opening Install Driver dialog.
Fix installation of non-PostScript drivers from Drivers tab (parsing of DFFF EA type).
Refresh properly when deleting the only printer, driver, or port.
Add 'ArcaOS' to branding logic.
Added more logging (still needs work).

File:

• trunk/gui/shared/PrManUtl.VRS (modified) (4 diffs)

trunk/gui/shared/PrManUtl.VRS

@@ -11 +11 @@
         drv_path = STREAM( drv_path, 'C', 'QUERY EXISTS')
 RETURN drv_path
+
+
+/*:VRX         GetDriverFileList
+*/
+GetDriverFileList: PROCEDURE
+    PARSE ARG eaname, driver
+    filelist = ''
+
+    /* Read the list of required driver files from the EAs, and copy them
+     * all to the target directory.
+     */
+    IF SysGetEA( driver, eaname, 'reqfiles') == 0 THEN DO
+        PARSE VAR reqfiles 1 eatype 3 .
+        eatype = C2X( eatype )
+
+        IF eatype == 'FDFF' THEN DO         /* Single ASCII value from byte 5 */
+            PARSE VAR reqfiles 5 filelist
+        END
+        ELSE IF eatype = 'DEFF' THEN DO     /* Single-type list from byte 7 */
+            PARSE VAR reqfiles 7 fl_type 9 fl_items
+
+            /* Parse the first value out of the list.  The first two bytes are the
+             * length of the value.
+             */
+            PARSE VAR fl_items 1 i_len 3 i_val
+            len = C2D( REVERSE( i_len ))
+            filelist = SUBSTR( i_val, 1, len )
+        END
+        ELSE IF eatype = 'DFFF' THEN DO     /* Multi-type list from byte 7 */
+            PARSE VAR reqfiles 7 fl_items
+
+            /* Parse the first value out of the list.  The first two bytes are the
+             * data type; this should always be ASCII ('FDFF') so we can skip it.
+             * The following word holds the length of the value.
+             */
+            PARSE VAR fl_items 3 i_len 5 i_val
+            len = C2D( REVERSE( i_len ))
+            filelist = SUBSTR( i_val, 1, len )
+        END
+        filelist = TRANSLATE( filelist, ' ', ',')
+    END
+
+RETURN filelist
 
 
@@ -244 +287 @@
      * all to the target directory.
      */
+/**** OLD
     IF SysGetEA( driver, 'REQUIREDDRIVERFILES', 'reqfiles') == 0 THEN DO
         PARSE VAR reqfiles 5 filelist
@@ -255 +299 @@
         DROP filelist
     END
+****/
+    filelist = GetDriverFileList('REQUIREDDRIVERFILES', driver )
+    IF filelist <> '' THEN DO
+        DO i = 1 TO WORDS( filelist )
+            copyfile = drv_dir'\' || WORD( filelist, i )
+            ok = VRCopyFile( copyfile, newdrvdir'\' || WORD( filelist, i ))
+            CALL LINEOUT globals.!log1, ' -' copyfile '(REQUIRED):' ok
+        END
+        DROP copyfile
+        DROP filelist
+    END
     ELSE RETURN 0
 
     /* If there are optional files defined as well, try to copy those also.
      */
+/**** OLD
     IF SysGetEA( driver, 'OPTIONALDRIVERFILES', 'reqfiles') == 0 THEN DO
         PARSE VAR reqfiles 5 filelist
@@ -265 +321 @@
             copyfile = drv_dir'\' || WORD( filelist, i )
             IF STREAM( copyfile, 'C', 'QUERY EXISTS') == '' THEN ITERATE
+            ok = VRCopyFile( copyfile, newdrvdir'\' || WORD( filelist, i ))
+            CALL LINEOUT globals.!log1, ' -' copyfile '(OPTIONAL):' ok
+        END
+        DROP copyfile
+        DROP filelist
+    END
+****/
+    filelist = GetDriverFileList('OPTIONALDRIVERFILES', driver )
+    IF filelist <> '' THEN DO
+        DO i = 1 TO WORDS( filelist )
+            copyfile = drv_dir'\' || WORD( filelist, i )
             ok = VRCopyFile( copyfile, newdrvdir'\' || WORD( filelist, i ))
             CALL LINEOUT globals.!log1, ' -' copyfile '(OPTIONAL):' ok