[yast-commit] r53438 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printer.ycp src/helps.ycp src/overview.ycp src/printer_proposal.ycp

19 Nov 2008

Author: jsmeix
Date: Wed Nov 19 17:05:04 2008
New Revision: 53438

URL: http://svn.opensuse.org/viewcvs/yast?rev=53438&view=rev
Log:

- Avoid to autoconfigure multiple queues for the same printer
  if the printer is accessible via multiple connections
  (see Novell/Suse Bugzilla bnc#437735 starting at comment #14).
- Fixed testpage printing again, made it more fail safe.
- 2.17.42


Modified:
    trunk/printer/VERSION
    trunk/printer/package/yast2-printer.changes
    trunk/printer/src/Printer.ycp
    trunk/printer/src/helps.ycp
    trunk/printer/src/overview.ycp
    trunk/printer/src/printer_proposal.ycp

Modified: trunk/printer/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=53438&r1=53437&r2=53438&view=diff
==============================================================================

--- trunk/printer/VERSION (original)
+++ trunk/printer/VERSION Wed Nov 19 17:05:04 2008
@@ -1 +1 @@
-2.17.41
+2.17.42

Modified: trunk/printer/package/yast2-printer.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=53438&r1=53437&r2=53438&view=diff
==============================================================================
--- trunk/printer/package/yast2-printer.changes (original)
+++ trunk/printer/package/yast2-printer.changes Wed Nov 19 17:05:04 2008
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Wed Nov 19 16:35:13 CET 2008 - jsmeix@suse.de
+
+- Avoid to autoconfigure multiple queues for the same printer
+  if the printer is accessible via multiple connections
+  (see Novell/Suse Bugzilla bnc#437735 starting at comment #14).
+- Fixed testpage printing again, made it more fail safe.
+- 2.17.42
+
+-------------------------------------------------------------------
 Fri Nov 14 15:55:55 CET 2008 - mzugec@suse.cz
 
 - autoconfigure local printers during installation (bnc#437735)

Modified: trunk/printer/src/Printer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=53438&r1=53437&r2=53438&view=diff
==============================================================================
--- trunk/printer/src/Printer.ycp (original)
+++ trunk/printer/src/Printer.ycp Wed Nov 19 17:05:04 2008
@@ -923,13 +923,17 @@
     // which is needed here to preserve any entry to be on the safe side:
     connections = (list  >)merge( connection_wizard_connections, connections );
   }
-  // Determine if there is at least one "hp:/usb/" DeviceURI:
+  // Determine if there is at least one "hp:/usb/" DeviceURI
+  // and if there is at least one "parallel:/" DeviceURI
   boolean hp_usb_uri_exists = false;
+  boolean parallel_uri_exists = false;
   foreach( map< string, string > connection_entry,
            connections,
            { if( "hp:/usb/" == substring( connection_entry["uri"]:"", 0, 8 ) )
              { hp_usb_uri_exists = true;
-               break;
+             }
+             if( "parallel:/" == substring( connection_entry["uri"]:"", 0, 10 ) )
+             { parallel_uri_exists = true;
              }
            }
          );
@@ -1002,15 +1006,35 @@
                      { y2milestone( "skipped 'usb://HP/' DeviceURI '%1'", uri );
                      }
                      else
-                     { // Add trailing spaces because the current YaST UI
-                       // has almost no additional space between table columns
-                       // in partitcular not where the widest entry in a column is:
-                       connection_items = add( connection_items, `item( `id( connections_index ),
-                                                                        model + " ",
-                                                                        uri + " ",
-                                                                        info
-                                                                      )
-                                             );
+                     { // Skip "hp:/par/" DeviceURIs if there is at least one "parallel:/" DeviceURI
+                       // so that the "parallel:/" DeviceURI is used with preference.
+                       // The reason for this preference is that for my LaserJet 1220
+                       // which is accessible via "parallel:/dev/lp0" and
+                       // via "hp:/par/HP_LaserJet_1220?device=/dev/parport0"
+                       // it does not work for the "hp:/par/" DeviceURI and in /var/log/messages there is
+                       // ... parport0: io/hpmud/pp.c 517: compat_write_data transfer stalled
+                       // ... parport0: io/hpmud/musb.c 1339: unable to write data
+                       //     hp:/par/HP_LaserJet_1220?device=/dev/parport0: Resource temporarily unavailable
+                       // so that the generic "parallel:/" DeviceURI seems to be the better fail-safe default.
+                       // It should not happen that a "hp:/par/" DeviceURI is skipped without
+                       // having a matching  generic "parallel:/" DeviceURI available.
+                       // The "hp:/par/" DeviceURI is still available via "MoreConnections".
+                       if( "hp:/par/" == tolower( substring( uri, 0, 8 ) )
+                           && parallel_uri_exists
+                         )
+                       { y2milestone( "skipped 'hp:/par/' DeviceURI '%1'", uri );
+                       }
+                       else
+                       { // Add trailing spaces because the current YaST UI
+                         // has almost no additional space between table columns
+                         // in partitcular not where the widest entry in a column is:
+                         connection_items = add( connection_items, `item( `id( connections_index ),
+                                                                          model + " ",
+                                                                          uri + " ",
+                                                                          info
+                                                                        )
+                                               );
+                       }
                      }
                    }
                  }

Modified: trunk/printer/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=53438&r1=53437&r2=53438&view=diff
==============================================================================
--- trunk/printer/src/helps.ycp (original)
+++ trunk/printer/src/helps.ycp Wed Nov 19 17:05:04 2008
@@ -84,7 +84,7 @@
 // Overview dialog help 4/7:
 _("<p>
 <b><big>Change the settings for a queue:</big></b><br>
-Select a local queue and press <b>Configure</b>.
+Select a local queue and press <b>Edit</b>.
 </p>") +
 // Overview dialog help 5/7:
 _("<p>

Modified: trunk/printer/src/overview.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=53438&r1=53437&r2=53438&view=diff
==============================================================================
--- trunk/printer/src/overview.ycp (original)
+++ trunk/printer/src/overview.ycp Wed Nov 19 17:05:04 2008
@@ -104,8 +104,8 @@
                                        Label::AddButton()
                                      ),
                           `PushButton( `id(`edit),
-                                       // PushButton label to modify an already configured print queue:
-                                       _("&Configure")),
+                                       Label::EditButton()
+                                     ),
                           `PushButton( `id(`delete),
                                        Label::DeleteButton()
                                      ),
@@ -355,7 +355,8 @@
   UI::ChangeWidget( `delete, `Enabled, Printer::selected_queues_index >= 0 );
 
   if( `delete == event["ID"]:nil && "Activated" == event["EventReason"]:"" )
-  { string queue_name = Printer::queues[selected_queue_index,"name"]:"";
+  { // Delete ' characters because they are used for quoting in the bash commandlines below:
+    string queue_name = deletechars( Printer::queues[selected_queue_index,"name"]:"", "'" );
     if( "" == queue_name )
     { Popup::AnyMessage( // Header of a Popup::AnyMessage when no queue was selected from the list:
                          _("Nothing Selected"),
@@ -396,8 +397,8 @@
 
   if( `test == event["ID"]:nil && "Activated" == event["EventReason"]:"" )
   { y2milestone( "printing test page" );
-    string queue_name = "";
-    queue_name = Printer::queues[selected_queue_index,"name"]:"";
+    // Delete ' characters because they are used for quoting in the bash commandlines below:
+    string queue_name = deletechars( Printer::queues[selected_queue_index,"name"]:"", "'" );
     if( "" == queue_name )
     { Popup::AnyMessage( // Header of a Popup::AnyMessage when no queue was selected from the list:
                          _("Nothing Selected"),
@@ -465,11 +466,16 @@
         }
       }
     }
+    string testprint_job_title = "YaST2testprint_" + queue_name;
     // Do not enforce to talk to the cupsd on localhost when submiting the testpage
     // because testpage printing must also work for a "client-only" config:
     if( ! Printerlib::ExecuteBashCommand( "/usr/bin/lp -d '"
                                           + queue_name
-                                          + "' -o page-label=\"Testprint_from_$(hostname)\" /usr/share/cups/data/testprint.ps"
+                                          + "' -t '"
+                                          + testprint_job_title
+                                          + "' -o page-label=\""
+                                          + queue_name
+                                          + "_testprint_from_$(hostname)\" /usr/share/cups/data/testprint.ps"
                                         )
       )
     { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails
@@ -593,7 +599,8 @@
   }
 
   if( `edit == event["ID"]:nil && event["EventReason"]:"" == "Activated" )
-  { string queue_name = Printer::queues[selected_queue_index,"name"]:"";
+  { // Delete ' characters because they are used for quoting in the bash commandlines below:
+    string queue_name = deletechars( Printer::queues[selected_queue_index,"name"]:"", "'" );
     if( "" == queue_name )
     { Popup::AnyMessage( // Header of a Popup::AnyMessage when no queue was selected from the list:
                          _("Nothing Selected"),

Modified: trunk/printer/src/printer_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp?rev=53438&r1=53437&r2=53438&view=diff
==============================================================================
--- trunk/printer/src/printer_proposal.ycp (original)
+++ trunk/printer/src/printer_proposal.ycp Wed Nov 19 17:05:04 2008
@@ -67,9 +67,17 @@
  y2milestone("Detected local printers : %1", detected_printers);
  if (size(detected_printers)>0){
   y2milestone("Local printers detected, will configure");
+  // Autodetect existing queues so that Printer::NewQueueName can compare against existing queue names
+  // but ignore whatever failures (an empty list of autodetected queues is the fallback result):
+  Printer::AutodetectQueues();
+  list<string> already_set_up_queue_names = [];
   foreach(term printer, detected_printers, {
    y2internal("Configure queue for backend %1", printer[2]:"");
    string queue_name = Printer::NewQueueName( tolower( printer[1]:"" ));
+   if (contains(already_set_up_queue_names, queue_name)){
+    y2internal("Skipping printer '%1' because it is already set up as queue %2", printer, queue_name);
+    continue;
+   }
    y2milestone("Proposed queue name : %1", queue_name);
    list drivers = Printer::DriverItems( filterchars( tolower( String::CutBlanks(printer[1]:"") ), Printer::lower_alnum_chars ), true );
    if (size(drivers)>0){
@@ -77,7 +85,7 @@
     y2internal("Selected driver : %1", drivers[0]:nil);
     Printer::selected_ppds_index=drivers[0,0,0]:-1;
     Printer::selected_connections_index=printer[0,0]:-1;
-    Printer::AddQueue(queue_name);
+    if (Printer::AddQueue(queue_name)) already_set_up_queue_names = add(already_set_up_queue_names, queue_name);
    } else y2error("No available drivers for printer %1", printer);
   });
  } else {
@@ -85,7 +93,7 @@
  }
 
     foreach( term queue, (list<term>) Printer::QueueItems(true, false), {
-	proposal = add(proposal, queue[3]:"");
+	proposal = add(proposal, queue[2]:"" + " : " + queue[3]:"");
     });
 /*
     proposal = maplist ( map< string, string > queue, Printer::queues, {

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r53438 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printer.ycp src/helps.ycp src/overview.ycp src/printer_proposal.ycp

jsmeix＠svn.opensuse.org