Changeset 55 for trunk/gui

Timestamp:

Feb 13, 2017, 12:52:19 PM (9 years ago)

Author:

Alex Taylor

Message:

Fix bad return value from PrinterExistsInDRV, more logging.

Location:

trunk/gui

Files:

• printer/cupswiz/cupswiz.VRP (modified) (1 diff)
• printer/cupswiz/cupswiz.VRX (modified) (4 diffs)
• shared/PrintUtl.VRS (modified) (1 diff)

trunk/gui/printer/cupswiz/cupswiz.VRP

@@ -7 +7 @@
 VRXWindow: __VREMainWindow,1,578,2746,5770,9106
 VRXWindow: __VRESectionListWindow,1,650,11900,4529,3891
-VRXWindow: __VREToolsWindow,1,1650,9973,5468,1665
+VRXWindow: __VREToolsWindow,1,1650,9973,5471,1667
 VRXWindow: __VREWindListWindow,1,5191,11900,2650,3891
 UserFile: 1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -393 +393 @@
     /* Create the CUPS printer */
     IF globals.!remotecups == '' THEN DO
+        CALL LINEOUT globals.!log1, 'No local printer, creating remote CUPS printer'
         ok = CreateCupsPrinter()
         IF ok <> 0 THEN
@@ -400 +401 @@
     /* Now create the OS/2 printer object */
     IF create_os2 == 1 & globals.!os2driver <> '' THEN DO
+
+        CALL LINEOUT globals.!log1, 'Creating OS/2 printer object:'
+        CALL LINEOUT globals.!log1, 'Mode:  ' globals.!mode
+        CALL LINEOUT globals.!log1, 'Driver:' globals.!os2driver
+        CALL LINEOUT globals.!log1, 'Model: ' globals.!prt_nick
 
         /* Make sure the presentation driver supports the printer */
@@ -405 +411 @@
             /* Always (re)import when a PPD is provided by the user
              */
+            CALL LINEOUT globals.!log1, 'Importing user-supplied PPD' globals.!prt_ppd
+
             ok = ImportPPD( globals.!os2driver, globals.!prt_ppd )
             IF ok <> 0 THEN DO
@@ -422 +430 @@
         ELSE DO
             drv_model = PrinterExistsInDRV( globals.!os2driver, globals.!prt_nick )
+            CALL LINEOUT globals.!log1, 'PrinterExistsInDRV(' globals.!os2driver',' globals.!prt_nick '):' drv_model
             IF drv_model == '' THEN DO
                 cups_ppd = globals.!prt_ppd

trunk/gui/shared/PrintUtl.VRS

@@ -189 +189 @@
     /* ?? TODO: install driver_name if not found (prompt first) ?? */
 
-    IF SysGetEA( printer_drv, '.EXPAND', 'exist_ea') <> 0 THEN RETURN 0
+    IF SysGetEA( printer_drv, '.EXPAND', 'exist_ea') <> 0 THEN RETURN ''
     PARSE VAR exist_ea 1 _eatype 3 .
-    IF C2X( _eatype ) <> 'FDFF' THEN RETURN 0
+    IF C2X( _eatype ) <> 'FDFF' THEN RETURN ''
 
     PARSE VAR exist_ea 3 _ealen 5 exist_models