Printerdrake changed to use Foomatic, driver options, spooler change

1 files changed, 698 insertions, 307 deletions

diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 21df546a2..2ba7b5c01 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -1,9 +1,10 @@
-package printerdrake; # $Id$
+package printerdrake;
+# $Id$
 
 use diagnostics;
 use strict;
 
-use common;
+use common qw(:common :file :functional :system);
 use detect_devices;
 use commands;
 use modules;
@@ -33,9 +34,12 @@ sub auto_detect {
 sub setup_local($$$) {
     my ($printer, $in, $install) = @_;
 
+    my $queue = $printer->{OLD_QUEUE};
     my @port = ();
     my @str = ();
+    my $device;
     my @parport = auto_detect($in);
+    # $printer->{currentqueue}{queuedata}
     foreach (@parport) {
 	$_->{val}{DESCRIPTION} and push @str, _("A printer, model \"%s\", has been detected on ",
 						$_->{val}{DESCRIPTION}) . $_->{port};
@@ -45,92 +49,240 @@ sub setup_local($$$) {
     } else {
 	@port = map { $_->{port} } grep { $_->{val}{DESCRIPTION} } @parport;
     }
-    $printer->{DEVICE} = $port[0] if $port[0];
-
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{'connect'} =~ m/^file:/)) {
+	$device = $printer->{currentqueue}{'connect'};
+	$device =~ s/^file://;
+    } elsif ($port[0]) {
+	$device = $port[0];
+    }
     if ($in) {
 	$::expert or $in->set_help('configurePrinterDev') if $::isInstall;
 	return if !$in->ask_from_entries_refH(_("Local Printer Device"),
 _("What device is your printer connected to 
 (note that /dev/lp0 is equivalent to LPT1:)?\n") . (join "\n", @str), [
-{ label => _("Printer Device"), val => \$printer->{DEVICE}, list => \@port } ],
+{ label => _("Printer Device"), val => \$device, list => \@port, not_edit => !$::expert } ],
+complete => sub {
+    unless ($device ne "") {
+	$in->ask_warn('', __("Device/file name missing!"));
+	return (1,0);
+    }
+    return 0;
+}
 					     );
     }
 
-    #- make the DeviceURI from DEVICE.
-    $printer->{DeviceURI} = ($printer->{DEVICE} =~ /usb/ ? "usb:" : "parallel:") . $printer->{DEVICE};
+    #- make the DeviceURI from $device.
+    $printer->{currentqueue}{'connect'} = "file:" . $device;
+
+    #- Read the printer driver database if necessary
+    if ((keys %printer::thedb) == 0) {printer::read_printer_db();}
 
+    #- Search the database entry which matches the detected printer best
     foreach (@parport) {
-	$printer->{DEVICE} eq $_->{port} or next;
-	$printer->{DBENTRY} = $printer::descr_to_db{common::bestMatchSentence($_->{val}{DESCRIPTION},
-									      @printer::entry_db_description)};
-        $printer->{cupsDescr} = common::bestMatchSentence($_->{val}{DESCRIPTION}, keys %printer::descr_to_ppd);
+	$device eq $_->{port} or next;
+        $printer->{DBENTRY} =
+            common::bestMatchSentence2($_->{val}{DESCRIPTION}, 
+            keys %printer::thedb);
     }
     1;
 }
 
-sub setup_remote($$$) {
+sub setup_lpd($$$) {
     my ($printer, $in, $install) = @_;
 
+    my $uri;
+    my $remotehost;
+    my $remotequeue;
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{'connect'} =~ m/^lpd:/)) {
+	$uri = $printer->{currentqueue}{'connect'};
+	$uri =~ m!^\s*lpd://([^/]+)/([^/]+)/?\s*$!;
+	$remotehost = $1;
+	$remotequeue = $2;
+    } else {
+	$remotehost = "";
+	$remotequeue = "lp";
+    }
+
     return if !$in->ask_from_entries_refH(_("Remote lpd Printer Options"),
-_("To use a remote lpd print queue, you need to supply
+__("To use a remote lpd print queue, you need to supply
 the hostname of the printer server and the queue name
-on that server which jobs should be placed in."), [
-{ label => _("Remote hostname"), val => \$printer->{REMOTEHOST} },
-{ label => _("Remote queue"), val => \$printer->{REMOTEQUEUE} } ],
+on that server."), [
+{ label => _("Remote hostname"), val => \$remotehost },
+{ label => _("Remote queue"), val => \$remotequeue } ],
+complete => sub {
+    unless ($remotehost ne "") {
+	$in->ask_warn('', __("Remote host name missing!"));
+	return (1,0);
+    }
+    unless ($remotequeue ne "") {
+	$in->ask_warn('', __("Remote queue name missing!"));
+	return (1,1);
+    }
+    return 0;
+}
 			      );
-    #- make the DeviceURI from DEVICE.
-    $printer->{DeviceURI} = "lpd://$printer->{REMOTEHOST}/$printer->{REMOTEQUEUE}";
+    #- make the DeviceURI from user input.
+    $printer->{currentqueue}{'connect'} = 
+        "lpd://$remotehost/$remotequeue";
 }
 
 sub setup_smb($$$) {
     my ($printer, $in, $install) = @_;
 
+    my $uri;
+    my $smbuser = "";
+    my $smbpassword = "";
+    my $workgroup = "";
+    my $smbserver = "";
+    my $smbserverip = "";
+    my $smbshare = "";
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{'connect'} =~ m/^smb:/)) {
+	$uri = $printer->{currentqueue}{'connect'};
+	$uri =~ m!^\s*smb://(.*)$!;
+	my $parameters = $1;
+	# Get the user's login and password from the URI
+	if ($parameters =~ m!([^@]*)@([^@]+)!) {
+	    my $login = $1;
+	    $parameters = $2;
+	    if ($login =~ m!([^:]*):([^:]*)!) {
+		$smbuser = $1;
+		$smbpassword = $2;
+	    } else {
+		$smbuser = $login;
+		$smbpassword = "";
+	    }
+	} else {
+	    $smbuser = "";
+	    $smbpassword = "";
+	}
+	# Get the workgroup, server, and share name
+	if ($parameters =~ m!([^/]*)/([^/]+)/([^/]+)$!) {
+	    $workgroup = $1;
+	    $smbserver = $2;
+	    $smbshare = $3;
+	} elsif ($parameters =~ m!([^/]+)/([^/]+)$!) {
+	    $workgroup = "";
+	    $smbserver = $1;
+	    $smbshare = $2;
+	} else {
+	    die "The \"smb://\" URI must at least contain the server name and the share name!\n";
+	}
+	if (network::is_ip($smbserver)) {
+	    $smbserverip = $smbserver;
+	    $smbserver = "";
+	}
+    }
+
     return if !$in->ask_from_entries_refH(_("SMB (Windows 9x/NT) Printer Options"),
 _("To print to a SMB printer, you need to provide the
 SMB host name (Note! It may be different from its
 TCP/IP hostname!) and possibly the IP address of the print server, as
 well as the share name for the printer you wish to access and any
 applicable user name, password, and workgroup information."), [
-{ label => _("SMB server host"), val => \$printer->{SMBHOST} },
-{ label => _("SMB server IP"), val => \$printer->{SMBHOSTIP} },
-{ label => _("Share name"), val => \$printer->{SMBSHARE} },
-{ label => _("User name"), val => \$printer->{SMBUSER} },
-{ label => _("Password"), val => \$printer->{SMBPASSWD}, hidden => 1 },
-{ label => _("Workgroup"), val => \$printer->{SMBWORKGROUP} }, ],
-					 complete => sub {
-					     unless (network::is_ip($printer->{SMBHOSTIP})) {
-						 $in->ask_warn('', _("IP address should be in format 1.2.3.4"));
-						 return (1,1);
-					     }
-					     return 0;
-					 },
-					);
-    #- make the DeviceURI from DEVICE, try to probe for available variable to build a some suitable URI.
-    #- Yes, SMBWORKGROUP is not used here, seems to be not usefull for cups.
-    $printer->{DeviceURI} = join '', ("smb://",
-				      ($printer->{SMBUSER} && ($printer->{SMBUSER} .
-							       ($printer->{SMBPASSWD} && ":$printer->{SMBPASSWD}") . "@")),
-				      ($printer->{SMBHOST} || $printer->{SMBHOSTIP}),
-				      "/$printer->{SMBSHARE}");
-
-    &$install('samba');
-    $printer->{mode} eq 'CUPS' and printer::restart_queue($printer);
+{ label => _("SMB server host"), val => \$smbserver },
+{ label => _("SMB server IP"), val => \$smbserverip },
+{ label => _("Share name"), val => \$smbshare },
+{ label => _("User name"), val => \$smbuser },
+{ label => _("Password"), val => \$smbpassword, hidden => 1 },
+{ label => _("Workgroup"), val => \$workgroup }, ],
+complete => sub {
+    unless ((network::is_ip($smbserverip)) || ($smbserverip eq "")) {
+	$in->ask_warn('', _("IP address should be in format 1.2.3.4"));
+	return (1,1);
+    }
+    unless (($smbserver ne "") || ($smbserverip ne "")) {
+	$in->ask_warn('', __("Either the server name or the server's IP must be given!"));
+	return (1,0);
+    }
+    unless ($smbshare ne "") {
+	$in->ask_warn('', __("Samba share name missing!"));
+	return (1,2);
+    }
+    return 0;
+}
+    );
+    #- make the DeviceURI from, try to probe for available variable to
+    #- build a suitable URI.
+    $printer->{currentqueue}{'connect'} =
+    join '', ("smb://", ($smbuser && ($smbuser . 
+    ($smbpassword && ":$smbpassword") . "@")), ($workgroup && ("$workgroup/")),
+    ($smbserver || $smbserverip), "/$smbshare");
+
+    &$install('samba-client');
+    $printer->{SPOOLER} eq 'cups' and printer::restart_queue($printer);
     1;
 }
 
 sub setup_ncp($$$) {
     my ($printer, $in, $install) = @_;
 
+    my $uri;
+    my $ncpuser = "";
+    my $ncppassword = "";
+    my $ncpserver = "";
+    my $ncpqueue = "";
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{'connect'} =~ m/^ncp:/)) {
+	$uri = $printer->{currentqueue}{'connect'};
+	$uri =~ m!^\s*ncp://(.*)$!;
+	my $parameters = $1;
+	# Get the user's login and password from the URI
+	if ($parameters =~ m!([^@]*)@([^@]+)!) {
+	    my $login = $1;
+	    $parameters = $2;
+	    if ($login =~ m!([^:]*):([^:]*)!) {
+		$ncpuser = $1;
+		$ncppassword = $2;
+	    } else {
+		$ncpuser = $login;
+		$ncppassword = "";
+	    }
+	} else {
+	    $ncpuser = "";
+	    $ncppassword = "";
+	}
+	# Get the workgroup, server, and share name
+	if ($parameters =~ m!([^/]+)/([^/]+)$!) {
+	    $ncpserver = $1;
+	    $ncpqueue = $2;
+	} else {
+	    die "The \"ncp://\" URI must at least contain the server name and the share name!\n";
+	}
+    }
+
     return if !$in->ask_from_entries_refH(_("NetWare Printer Options"),
-_("To print to a NetWare printer, you need to provide the
+_("To print on a NetWare printer, you need to provide the
 NetWare print server name (Note! it may be different from its
 TCP/IP hostname!) as well as the print queue name for the printer you
 wish to access and any applicable user name and password."), [
-{ label => _("Printer Server"), val => \$printer->{NCPHOST} },
-{ label => _("Print Queue Name"), val => \$printer->{NCPQUEUE} },
-{ label => _("User name"), val => \$printer->{NCPUSER} },
-{ label => _("Password"), val => \$printer->{NCPPASSWD}, hidden => 1 } ],
+{ label => _("Printer Server"), val => \$ncpserver },
+{ label => _("Print Queue Name"), val => \$ncpqueue },
+{ label => _("User name"), val => \$ncpuser },
+{ label => _("Password"), val => \$ncppassword, hidden => 1 } ],
+complete => sub {
+    unless ($ncpserver ne "") {
+	$in->ask_warn('', __("NCP server name missing!"));
+	return (1,0);
+    }
+    unless ($ncpqueue ne "") {
+	$in->ask_warn('', __("NCP queue name missing!"));
+	return (1,1);
+    }
+    return 0;
+}
 					);
+    # Generate the Foomatic URI
+    $printer->{currentqueue}{'connect'} =
+    join '', ("ncp://", ($ncpuser && ($ncpuser . 
+    ($ncppassword && ":$ncppassword") . "@")),
+    "$ncpserver/$ncpqueue");
+
     &$install('ncpfs');
     1;
 }
@@ -139,16 +291,42 @@ sub setup_socket($$$) {
     my ($printer, $in, $install) = @_;
     my ($hostname, $port);
 
+    my $uri;
+    my $remotehost;
+    my $remoteport;
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{'connect'} =~ m/^socket:/)) {
+	$uri = $printer->{currentqueue}{'connect'};
+	$uri =~ m!^\s*socket://([^/:]+):([0-9]+)/?\s*$!;
+	$remotehost = $1;
+	$remoteport = $2;
+    } else {
+	$remotehost = "";
+	$remoteport = "9100";
+    }
+
     return if !$in->ask_from_entries_refH(_("Socket Printer Options"),
 _("To print to a socket printer, you need to provide the
 hostname of the printer and optionally the port number."), [
-{ label => _("Printer Hostname"), val => \$hostname },
-{ label => _("Port"), val => \$port } ],
+{ label => _("Printer Hostname"), val => \$remotehost },
+{ label => _("Port"), val => \$remoteport } ],
+complete => sub {
+    unless ($remotehost ne "") {
+	$in->ask_warn('', __("Printer host name missing!"));
+	return (1,0);
+    }
+    unless ($remoteport =~ /^[0-9]+$/) {
+	$in->ask_warn('', __("The port must be an integer number!"));
+	return (1,1);
+    }
+    return 0;
+}
 					 );
 
-    #- make the DeviceURI parameters given above, these parameters are not in printer
-    #- structure as only the URI is needed (cups only).
-    $printer->{DeviceURI} = join '', ("socket://$hostname", $port ? (":$port") : ());
+    #- make the Foomatic URI
+    $printer->{currentqueue}{'connect'} = 
+    join '', ("socket://$remotehost", $remoteport ? (":$remoteport") : ());
     1;
 }
 
@@ -156,52 +334,264 @@ sub setup_uri($$$) {
     my ($printer, $in, $install) = @_;
 
     return if !$in->ask_from_entries_refH(_("Printer Device URI"),
-_("You can specify directly the URI to access the printer with CUPS."), [
-{ label => _("Printer Device URI"), val => \$printer->{DeviceURI}, list => [ printer::get_direct_uri(),
-                                                                      "file:/",
-                                                                      "http://",
-                                                                      "ipp://",
-                                                                      "lpq://",
-                                                                      "smb://",
-                                                                      "socket://",
-                                                                    ], not_edit => 0 }, ],
-					 );
-    if ($printer->{DeviceURI} =~ /^smb:/) {
-        &$install('samba');
+__("You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Not that not all URI types are supported by all the spoolers."), [
+{ label => _("Printer Device URI"),
+val => \$printer->{currentqueue}{'connect'},
+list => [ $printer->{currentqueue}{'connect'},
+	  "file:/",
+	  "http://",
+	  "ipp://",
+	  "lpd://",
+	  "smb://",
+	  "ncp://",
+	  "socket://",
+	  "postpipe:",
+	  ], not_edit => 0 }, ],
+complete => sub {
+    unless ($printer->{currentqueue}{'connect'} =~ /[^:]+:.+/) {
+	$in->ask_warn('', __("A valid URI must be entered!"));
+	return (1,0);
+    }
+    return 0;
+}
+    );
+    if ($printer->{currentqueue}{'connect'} =~ /^smb:/) {
+        &$install('samba-client');
+        printer::restart_queue($printer);
+    }
+    if ($printer->{currentqueue}{'connect'} =~ /^ncp:/) {
+        &$install('ncpfs');
         printer::restart_queue($printer);
     }
     1;
 }
 
-sub setup_gsdriver($$$;$) {
-    my ($printer, $in, $install, $upNetwork) = @_;
-    for ($printer->{mode}) {
-	/CUPS/ && return setup_gsdriver_cups($printer, $in, $install, $upNetwork);
-	/lpr/  && return setup_gsdriver_lpr($printer, $in, $install, $upNetwork);
-	die "mode not chosen to configure a printer";
+sub setup_postpipe($$$) {
+    my ($printer, $in, $install) = @_;
+
+    my $uri;
+    my $commandline;
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{'connect'} =~ m/^postpipe:/)) {
+	$uri = $printer->{currentqueue}{'connect'};
+	$uri =~ m!^\s*postpipe:(.*)$!;
+	$commandline = $1;
+    } else {
+	$commandline = "";
+    }
+
+    return if !$in->ask_from_entries_refH(__("Pipe into command"),
+__("Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer."), [
+{ label => _("Command line"),
+val => \$commandline }, ],
+complete => sub {
+    unless ($commandline ne "") {
+	$in->ask_warn('', __("A command line must be entered!"));
+	return (1,0);
     }
+    return 0;
 }
+);
 
-sub setup_gsdriver_cups($$$;$) {
+    #- make the Foomatic URI
+    $printer->{currentqueue}{'connect'} = "postpipe:$commandline";
+    
+    1;
+}
+
+sub setup_gsdriver($$$;$) {
     my ($printer, $in, $install, $upNetwork) = @_;
+    #- Read the printer driver database if necessary
+    if ((keys %printer::thedb) == 0) {printer::read_printer_db();}
     my $testpage = "/usr/share/cups/data/testprint.ps";
-
+    my $queue = $printer->{OLD_QUEUE};
     $in->set_help('configurePrinterType') if $::isInstall;
     while (1) {
-	$printer->{cupsDescr} ||= printer::get_descr_from_ppd($printer);
-	$printer->{cupsDescr} = $in->ask_from_treelist('', _("What type of printer do you have?"), '|',
-						       [ keys %printer::descr_to_ppd ], $printer->{cupsDescr}) or return;
-	$printer->{cupsPPD} = $printer::descr_to_ppd{$printer->{cupsDescr}};
-
-	#- install additional tools according to PPD files.
-        $printer->{cupsPPD} =~ /lexmark/i and &$install('ghostscript-utils');
-
+	if ($printer->{configured}{$queue}) {
+	    # The queue was already configured
+	    if ($printer->{configured}{$queue}{'queuedata'}{'foomatic'}) {
+		# The queue was configured with Foomatic
+		my $driverstr;
+		if ($printer->{configured}{$queue}{'driver'} eq "Postscript") {
+		    $driverstr = "PostScript";
+		} else {
+		    $driverstr =
+			"GhostScript + $printer->{configured}{$queue}{'driver'}";
+		}
+		my $make = $printer->{configured}{$queue}{'make'};
+		my $model =
+		    $printer->{configured}{$queue}{'model'};
+		$printer->{DBENTRY} = "$make|$model|$driverstr";
+	    } elsif ($printer->{SPOOLER} eq "cups") {
+		# Do we have a native CUPS driver or a PostScript PPD file?
+		$printer->{DBENTRY} = printer::get_descr_from_ppd($printer) ||
+		    $printer->{DBENTRY};
+	    }
+	}
+	# Choose the printer/driver from the list
+	my $oldchoice = $printer->{DBENTRY};
+	$printer->{DBENTRY} = $in->ask_from_treelist
+	    (__("Printer model selection"),
+	     __("Which printer model do you have?"), '|',
+	     [ keys %printer::thedb ], $printer->{DBENTRY}) or return;
+	$printer->{currentqueue}{'id'} =
+	    $printer::thedb{$printer->{DBENTRY}}{id};
+	$printer->{currentqueue}{'driver'} =
+	    $printer::thedb{$printer->{DBENTRY}}{driver};
+	$printer->{currentqueue}{'make'} =
+	    $printer::thedb{$printer->{DBENTRY}}{make};
+	$printer->{currentqueue}{'model'} =
+	    $printer::thedb{$printer->{DBENTRY}}{model};
+	if ($printer->{currentqueue}{'id'}) {
+	    # We have a Foomatic queue
+	    $printer->{currentqueue}{'foomatic'} = 1;
+	    # Now get the options for this printer/driver combo
+	    if (($printer->{configured}{$queue}) &&
+		($printer->{configured}{$queue}{'queuedata'}{'foomatic'})) {
+		# The queue was already configured with Foomatic ...
+		if ($printer->{DBENTRY} eq $oldchoice) {
+		    # ... and the user didn't change the printer/driver
+		    $printer->{ARGS} = $printer->{configured}{$queue}{'args'};
+		} else {
+		    # ... and the user has chosen another printer/driver
+		    $printer->{ARGS}=printer::read_foomatic_options($printer);
+		}
+	    } else {
+		$printer->{ARGS} = printer::read_foomatic_options($printer);
+	    }
+	    # Set up the widgets for the option dialog
+	    my @widgets;
+	    my @userinputs;
+	    my @choicelists;
+	    my @shortchoicelists;
+	    my $i;
+	    for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
+		my $optshortdefault = $printer->{ARGS}[$i]{'default'};
+		if ($printer->{ARGS}[$i]{'type'} eq 'enum') {
+		    # enumerated option
+		    push(@choicelists, []);
+		    push(@shortchoicelists, []);
+		    my $choice;
+		    for $choice (@{$printer->{ARGS}[$i]{'vals'}}) {
+			push(@{$choicelists[$i]}, $choice->{'comment'});
+			push(@{$shortchoicelists[$i]}, $choice->{'value'});
+			if ($choice->{'value'} eq $optshortdefault) {
+			    push(@userinputs, $choice->{'comment'});
+			}
+		    }
+		    push(@widgets,
+			 { label => $printer->{ARGS}[$i]{'comment'}, 
+			   val => \$userinputs[$i], 
+			   not_edit => 1,
+			   list => \@{$choicelists[$i]} });
+		} elsif ($printer->{ARGS}[$i]{'type'} eq 'bool') {
+		    # boolean option
+		    push(@choicelists, [$printer->{ARGS}[$i]{'name'}, 
+					$printer->{ARGS}[$i]{'name_false'}]);
+		    push(@shortchoicelists, []);
+		    push(@userinputs, $choicelists[$i][1-$optshortdefault]);
+		    push(@widgets,
+			 { label => $printer->{ARGS}[$i]{'comment'},
+			   val => \$userinputs[$i],
+			   not_edit => 1,
+			   list => \@{$choicelists[$i]} });
+		} else {
+		    # numerical option
+		    push(@choicelists, []);
+		    push(@shortchoicelists, []);
+		    push(@userinputs, $optshortdefault);
+		    push(@widgets,
+			 { label => $printer->{ARGS}[$i]{'comment'} . 
+			       " ($printer->{ARGS}[$i]{'min'} ... " .
+			       "$printer->{ARGS}[$i]{'max'})",
+			   #type => 'range',
+			   #min => $printer->{ARGS}[$i]{'min'},
+			   #max => $printer->{ARGS}[$i]{'max'},
+			   val => \$userinputs[$i] } );
+		}
+	    }
+	    # Show the options dialog. The call-back function does a
+	    # range check of the numerical options.
+	    my $windowtitle;
+#	    if ($::expert) {
+		$windowtitle = $printer->{DBENTRY};
+		$windowtitle =~ s/\|/ /;
+		$windowtitle =~ s/\|/, /;
+#	    } else {
+#		$windowtitle = "$printer->{currentqueue}{'make'} " .
+#		    "$printer->{currentqueue}{'model'}"
+#	    }
+	    return if !$in->ask_from_entries_refH
+		($windowtitle,
+		 _("Printer options"), \@widgets,
+		 complete => sub {
+		     my $i;
+		     for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
+			 if (($printer->{ARGS}[$i]{'type'} eq 'int') ||
+			     ($printer->{ARGS}[$i]{'type'} eq 'float')) {
+			     unless
+				 (($printer->{ARGS}[$i]{'type'} eq 'float') ||
+				  ($userinputs[$i] =~ /^[0-9]+$/)) {
+				 $in->ask_warn
+				     ('', __("Option $printer->{ARGS}[$i]{'comment'} must be an integer number!"));
+				 return (1, $i);
+			     }
+			     unless
+				 (($printer->{ARGS}[$i]{'type'} eq 'int') ||
+				  ($userinputs[$i] =~ /^[0-9\.]+$/)) {
+				 $in->ask_warn
+				     ('', __("Option $printer->{ARGS}[$i]{'comment'} must be a number!"));
+				 return (1, $i);
+			     }
+			     unless (($userinputs[$i] >= 
+				      $printer->{ARGS}[$i]{'min'}) &&
+				     ($userinputs[$i] <= 
+				      $printer->{ARGS}[$i]{'max'})) {
+				 $in->ask_warn
+				     ('', __("Option $printer->{ARGS}[$i]{'comment'} out of range!"));
+				 return (1, $i);
+			     }
+			 }
+		     }
+		     return (0);
+		 } );
+	    # Read out the user's choices
+	    @{$printer->{OPTIONS}} = ();
+	    for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
+		push(@{$printer->{OPTIONS}}, "-o");
+		if ($printer->{ARGS}[$i]{'type'} eq 'enum') {
+		    # enumerated option
+		    my $j;
+		    for ($j = 0; $j <= $#{$choicelists[$i]}; $j++) {
+			if ($choicelists[$i][$j] eq $userinputs[$i]) {
+			    push(@{$printer->{OPTIONS}},
+				$printer->{ARGS}[$i]{'name'} .
+				"=". $shortchoicelists[$i][$j]);
+			}
+		    }
+		} elsif ($printer->{ARGS}[$i]{'type'} eq 'bool') {
+		    # boolean option
+		    push(@{$printer->{OPTIONS}},
+				$printer->{ARGS}[$i]{'name'} .
+				"=". 
+				(($choicelists[$i][0] eq $userinputs[$i]) ?
+				 "1" : "0"));
+		} else {
+		    # numerical option
+		    push(@{$printer->{OPTIONS}},
+				$printer->{ARGS}[$i]{'name'} .
+				"=" . $userinputs[$i]);
+		}
+	    }
+	}
+	# print "$printer->{OPTIONS}\n";
+		
 	$printer->{complete} = 1;
-	printer::copy_printer_params($printer, $printer->{configured}{$printer->{QUEUE}} ||= {});
 	printer::configure_queue($printer);
 	$printer->{complete} = 0;
 	
-	if ($in->ask_yesorno('', _("Do you want to test printing?"), 1)) {
+	if ($in->ask_yesorno('', __("Do you want to print a test page?"), 1)) {
 	    my @lpq_output;
 	    {
 		my $w = $in->wait_message('', _("Printing test page(s)..."));
@@ -212,11 +602,11 @@ sub setup_gsdriver_cups($$$;$) {
 
 	    if (@lpq_output) {
 		$in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
-This may take a little time before printer start.
+It may take some time before the printer starts.
 Printing status:\n%s\n\nDoes it work properly?", "@lpq_output"), 1) and last;
 	    } else {
 		$in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
-This may take a little time before printer start.
+It may take some time before the printer starts.
 Does it work properly?"), 1) and last;
 	    }
 	} else {
@@ -226,294 +616,295 @@ Does it work properly?"), 1) and last;
     $printer->{complete} = 1;
 }
 
-sub setup_gsdriver_lpr($$$;$) {
+sub setup_gsdriver_cups($$$;$) {
     my ($printer, $in, $install, $upNetwork) = @_;
-    my $action;
-    my @action = qw(ascii ps both done);
-    my %action = (
-		  ascii  => _("Yes, print ASCII test page"),
-		  ps     => _("Yes, print PostScript test page"),
-		  both   => _("Yes, print both test pages"),
-		  done   => _("No"),
-		 );
-
-    do {
-	$printer->{DBENTRY} ||= $printer::thedb_gsdriver{$printer->{GSDRIVER}}{ENTRY};
-	$printer->{DBENTRY} = $printer::descr_to_db{
-	    $in->ask_from_list_(_("Configure Printer"),
-				_("What type of printer do you have?"),
-				[ @printer::entry_db_description ],
-				$printer::db_to_descr{$printer->{DBENTRY}},
-                                { %printer::descr_to_help }) || return
-	   };
-	my %db_entry = %{$printer::thedb{$printer->{DBENTRY}}};
-
-	#- specific printer drivers to install.
-	#-&$install('pnm2ppa') if $db_entry{GSDRIVER} eq 'ppa';
-
-	my @list_res = @{$db_entry{RESOLUTION} || []};
-	my @res = map { "$_->{XDPI}x$_->{YDPI}" } @list_res;
-	my @list_col      = @{$db_entry{BITSPERPIXEL} || []};
-	my @col           = map { "$_->{DEPTH} $_->{DESCR}" } @list_col;
-	my %col_to_depth  = map { ("$_->{DEPTH} $_->{DESCR}", $_->{DEPTH}) } @list_col;
-	my %depth_to_col  = reverse %col_to_depth;
-	my $is_uniprint = $db_entry{GSDRIVER} eq "uniprint";
-
-	$printer->{PAPERSIZE} ||= "letter";
-	$printer->{RESOLUTION} = @res ? $res[0] || "Default" : "Default" unless member($printer->{RESOLUTION}, @res);
-	$printer->{ASCII_TO_PS} = $db_entry{GSDRIVER} eq 'POSTSCRIPT' unless defined($printer->{ASCII_TO_PS});
-	$printer->{CRLF} = $db_entry{DESCR} =~ /HP/ unless defined($printer->{CRLF});
-	$printer->{BITSPERPIXEL} = @list_col ? $depth_to_col{$printer->{BITSPERPIXEL}} || $col[0] : "Default";
-	$printer->{NUP} = 1 unless member($printer->{NUP}, qw(1 2 4 8));
-	$printer->{RTLFTMAR} = 18 unless $printer->{RTLFTMAR} =~ /^\d+$/;
-	$printer->{TOPBOTMAR} = 18 unless $printer->{TOPBOTMAR} =~ /^\d+$/;
-	$printer->{EXTRA_GS_OPTIONS} =~ s/^"(.*)"/$1/;
-	$printer->{TEXTONLYOPTIONS} =~ s/^"(.*)"/$1/;
-
-	return if !$in->ask_from_entries_refH('', _("Printer options"), [
-{ label => _("Paper Size"), val => \$printer->{PAPERSIZE}, type => 'list', not_edit => !$::expert, list => \@printer::papersize_type },
-{ label => _("Eject page after job?"), val => \$printer->{AUTOSENDEOF}, type => 'bool' },
-  if_(@list_res > 1,
-{ label => _("Resolution"), val => \$printer->{RESOLUTION}, type => 'list', not_edit => !$::expert, list => \@res },
-  ), if_(@list_col > 1,
-     $is_uniprint ?
-{ label => _("Uniprint driver options"), val => \$printer->{BITSPERPIXEL}, type => 'list', list => \@col } :
-{ label => _("Color depth options"), val => \$printer->{BITSPERPIXEL}, type => 'list', list => \@col }
-  ), if_($db_entry{GSDRIVER} ne 'TEXT' && $db_entry{GSDRIVER} ne 'POSTSCRIPT' && $db_entry{GSDRIVER} ne 'ppa',
-{ label => _("Print text as PostScript?"), val => \$printer->{ASCII_TO_PS}, type => 'bool' },
-  ), if_($db_entry{GSDRIVER} ne 'POSTSCRIPT',
-{ label => _("Fix stair-stepping text?"), val => \$printer->{CRLF}, type => 'bool' },
-  ), if_($db_entry{GSDRIVER} ne 'TEXT',
-{ label => _("Number of pages per output pages"), val => \$printer->{NUP}, type => 'list', not_edit => !$::expert, list => [1,2,4,8] },
-{ label => _("Right/Left margins in points (1/72 of inch)"), val => \$printer->{RTLFTMAR} },
-{ label => _("Top/Bottom margins in points (1/72 of inch)"), val => \$printer->{TOPBOTMAR} },
-  ), if_($::expert && $db_entry{GSDRIVER} ne 'TEXT' && $db_entry{GSDRIVER} ne 'POSTSCRIPT',
-{ label => _("Extra GhostScript options"), val => \$printer->{EXTRA_GS_OPTIONS} },
-  ), if_($::expert && $db_entry{GSDRIVER} ne 'POSTSCRIPT',
-{ label => _("Extra Text options"), val => \$printer->{TEXTONLYOPTIONS} },
-  ),
-#+ { label => _("Reverse page order"), val => \$printer->{REVERSE_ORDER}, type => 'bool' },
-]);
-
-        $printer->{BITSPERPIXEL} = $col_to_depth{$printer->{BITSPERPIXEL}} || $printer->{BITSPERPIXEL}; #- translate back.
+    my $testpage = "/usr/share/cups/data/testprint.ps";
+    $in->set_help('configurePrinterType') if $::isInstall;
+    while (1) {
+	$printer->{cupsDescr} ||= printer::get_descr_from_ppd($printer);
+	$printer->{cupsDescr} = $in->ask_from_treelist('', _("What type of printer do you have?"), '|',
+						       [ keys %printer::descr_to_ppd ], $printer->{cupsDescr}) or return;
+	$printer->{cupsPPD} = $printer::descr_to_ppd{$printer->{cupsDescr}};
+
+	#- install additional tools according to PPD files.
+        $printer->{cupsPPD} =~ /lexmark/i and &$install('ghostscript-utils');
 
 	$printer->{complete} = 1;
 	printer::copy_printer_params($printer, $printer->{configured}{$printer->{QUEUE}} ||= {});
 	printer::configure_queue($printer);
 	$printer->{complete} = 0;
 	
-	$action = $in->ask_from_listf('', _("Do you want to test printing?"), sub { $action{$_[0]} }, \@action, 'done') or return;
-
-	my @testpages;
-	push @testpages, "/usr/lib/rhs/rhs-printfilters/testpage.asc"
-	  if $action eq "ascii" || $action eq "both";
-	push @testpages, "/usr/lib/rhs/rhs-printfilters/testpage". ($printer->{PAPERSIZE} eq 'a4' && '-a4') .".ps"
-	  if $action eq "ps" || $action eq "both";
-
-	if (@testpages) {
+	if ($in->ask_yesorno('', _("Do you want to test printing?"), 1)) {
 	    my @lpq_output;
 	    {
 		my $w = $in->wait_message('', _("Printing test page(s)..."));
 
 		$upNetwork and do { &$upNetwork(); undef $upNetwork; sleep(1) };
-		printer::restart_queue($printer);
-		@lpq_output = printer::print_pages($printer, @testpages);
+		@lpq_output = printer::print_pages($printer, $testpage);
 	    }
 
 	    if (@lpq_output) {
-		$action = $in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
+		$in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
 This may take a little time before printer start.
-Printing status:\n%s\n\nDoes it work properly?", "@lpq_output"), 1) ? 'done' : 'change';
+Printing status:\n%s\n\nDoes it work properly?", "@lpq_output"), 1) and last;
 	    } else {
-		$action = $in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
+		$in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
 This may take a little time before printer start.
-Does it work properly?"), 1) ? 'done' : 'change';
+Does it work properly?"), 1) and last;
 	    }
+	} else {
+	    last;
 	}
-    } while ($action ne 'done');
+    }
     $printer->{complete} = 1;
 }
 
+sub setup_default_spooler ($$) {
+    my ($printer, $in) = @_;
+    $printer->{SPOOLER} ||= 'cups';
+    my $str_spooler = 
+	$in->ask_from_list_(__("Select Printer Spooler"),
+			    __("Which printing system (spooler) do you want to use?"),
+			    [ printer::spooler() ],
+			    $printer::spooler_inv{$printer->{SPOOLER}},
+			    ) or return;
+    $printer->{SPOOLER} = $printer::spooler{$str_spooler};
+    # Get the queues of this spooler
+    printer::read_configured_queues($printer);
+    return $printer->{SPOOLER};
+}
+
 #- Program entry point for configuration with lpr or cups (stored in $mode).
 sub main($$$$;$) {
     my ($printer, $in, $ask_multiple_printer, $install, $upNetwork) = @_;
-    my ($queue, $continue) = ('', 1);
 
+    # printerdrake does not work without foomatic
+    &$install('foomatic') unless $::testing;
+
+    !$::expert && ($printer->{SPOOLER} ||= 'cups'); # only experts should be asked
+                                                 # for the spooler
+    my ($queue, $continue) = ('', 1);
     while ($continue) {
 	if (!$ask_multiple_printer && %{$printer->{configured} || {}} == ()) {
-	    $queue = $printer->{want} || $in->ask_yesorno(_("Printer"),
-							  _("Would you like to configure a printer?"), 0) ? 'lp' : 'Done';
+	    $queue = $printer->{want} || 
+		$in->ask_yesorno(_("Printer"),
+				 __("Would you like to configure printing?"),
+				 0) ? 'lp' : 'Done';
+	    $printer->{SPOOLER} ||= setup_default_spooler ($printer, $in) ||
+		return;
+	    
 	} else {
-	    unless (%{$printer->{configured} || {}} == ()) {
+	    # Ask for a spooler when noone is defined
+	    $printer->{SPOOLER} ||= setup_default_spooler ($printer, $in) ||
+		return;
+	    # Show a queue list window when there is at least one queue
+	    # or when we are in expert mode
+	    unless ((%{$printer->{configured} || {}} == ()) && (!$::expert)) {
 		$in->ask_from_entries_refH_powered(
-						   {
-						    messages =>
-_("Here are the following print queues.
-You can add some more or change the existing ones."),
-						    cancel => '',
-						   }, [ { val => \$queue, format => \&translate,
-							  list => [ (sort keys %{$printer->{configured} || {}}),
-								    __("Add"), __("Done") ] } ]
-						  );
-	    } else { $queue = 'Add' } #- as there are no printer already configured, Add one automatically.
-	    if ($queue eq 'Add') {
-		my %queues; @queues{map { split '\|', $_ } keys %{$printer->{configured}}} = ();
+		    {messages =>
+                      _("Here are the following print queues.
+                      You can add some more or change the existing ones."),
+		      cancel => '',
+		    },
+		    # List the queues
+                    [ { val => \$queue, format => \&translate,
+		        list => [ (sort keys %{$printer->{configured} || {}}),
+		    # Button to add a new queue
+		    __("Add queue"),
+		    # In expert mode we can change the spooler
+		    ($::expert ?
+		     ( __("Spooler: ") .
+		       $printer::spooler_inv{$printer->{SPOOLER}} ) : ()),
+		    # Bored by configuring your printers, get out of here!
+		    __("Done") ] } ]
+		);
+	    } else { $queue = 'Add queue' }  #- as there are no printers 
+	                                     #- already configured, Add one
+	                                     #- automatically.
+	    if ($queue eq 'Add queue') {
+		my %queues; 
+		@queues{map { split '\|', $_ } keys %{$printer->{configured}}} = ();
 		my $i = ''; while ($i < 100) { last unless exists $queues{"lp$i"}; ++$i; }
 		$queue = "lp$i";
 	    }
+	    if ($queue =~ /^Spooler: /) {
+		$printer->{SPOOLER} =
+		    setup_default_spooler ($printer, $in) || $printer->{SPOOLER};
+		next;
+	    }
 	}
+	# Save the default spooler
+	printer::set_default_spooler($printer);
+	#- Close printerdrake
 	$queue eq 'Done' and last;
 
-	#- switch according to what is being installed: cups, lpr or other.
-	for ($printer->{mode}) {
-	    /CUPS/ && do { &$install('cups-drivers') unless $::testing;
-			   my $w = $in->wait_message(_("CUPS starting"), _("Reading CUPS drivers database..."));
-			   printer::poll_ppd_base(); last };
-	    /lpr/  && do { &$install('rhs-printfilters') unless $::testing;
-			   printer::read_printer_db(); last };
-	}
-
-	printer::copy_printer_params($printer->{configured}{$queue}, $printer) if $printer->{configured}{$queue};
-	$printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue; #- keep in mind old name of queue (in case of changing)
+	#- Install the printer driver database
+	#for ($printer->{SPOOLER}) {
+	#    /CUPS/ && do { &$install('cups-drivers') unless $::testing;
+	#		   my $w = $in->wait_message(_("CUPS starting"), _("Reading CUPS drivers database..."));
+	#		   printer::poll_ppd_base(); last };
+	#}
+
+	#- Copy the queue data and work on the copy
+	$printer->{currentqueue} = {};
+	printer::copy_printer_params
+	    ($printer->{configured}{$queue}{'queuedata'},
+	     $printer->{currentqueue})
+	    if $printer->{configured}{$queue};
+	#- keep in mind old name of queue (in case of changing)
+	$printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
 
 	while ($continue) {
 	    $in->set_help('configurePrinterConnected') if $::isInstall;
-	    $printer::printer_type_inv{$printer->{TYPE}} or $printer->{TYPE} = printer::default_printer_type($printer);
-	    $printer->{str_type} = $printer::printer_type_inv{$printer->{TYPE}};
-	    if ($printer->{mode} eq 'CUPS') {
-		$printer->{str_type} = $in->ask_from_list_(_("Select Printer Connection"),
-							   _("How is the printer connected?"),
-							   [ printer::printer_type($printer) ],
-							   $printer->{str_type},
-							  ) or return;
-		$printer->{TYPE} = $printer::printer_type{$printer->{str_type}};
-		if ($printer->{TYPE} eq 'REMOTE') {
-		    $printer->{str_type} = $printer::printer_type_inv{CUPS};
-		    $printer->{str_type} = $in->ask_from_list_(_("Select Remote Printer Connection"),
-_("With a remote CUPS server, you do not have to configure
-any printer here; printers will be automatically detected.
-In case of doubt, select \"Remote CUPS server\"."),
-							       [ @printer::printer_type_inv{qw(CUPS LPD SOCKET)} ],
-							       $printer->{str_type},
-							      ) or return;
-		    $printer->{TYPE} = $printer::printer_type{$printer->{str_type}};
-		}
-		if ($printer->{TYPE} eq 'CUPS') {
-		    #- hack to handle cups remote server printing,
-		    #- first read /etc/cups/cupsd.conf for variable BrowsePoll address:port
-		    my @cupsd_conf = printer::read_cupsd_conf();
-		    my ($server, $port);
-
-		    foreach (@cupsd_conf) {
-			/^\s*BrowsePoll\s+(\S+)/ and $server = $1, last;
+	    if ($printer->{configured}{$queue}) {
+		#- Which printer type did we have before (check beginning of 
+		#- URI)
+		my $type;
+		for $type (qw(file lpd socket smb ncp postpipe)) {
+		    if ($printer->{currentqueue}{'connect'}
+			=~ /^$type:/) {
+			$printer->{TYPE} = 
+			    ($type eq 'file' ? 'LOCAL' : uc($type));
+			last;
 		    }
-		    $server =~ /([^:]*):(.*)/ and ($server, $port) = ($1, $2);
-
-		    #- then ask user for this combination
-		    #- and rewrite /etc/cups/cupsd.conf according to new settings.
-		    #- there are no other point where such information is written in this file.
-		    if ($in->ask_from_entries_refH(_("Remote CUPS server"),
+		}
+	    } else {
+		#- Set default values for a new queue
+		$printer::printer_type_inv{$printer->{TYPE}} or 
+		    $printer->{TYPE} = printer::default_printer_type($printer);
+		$printer->{currentqueue}{'queue'} = $queue;
+		$printer->{currentqueue}{'foomatic'} = 0;
+		$printer->{currentqueue}{'desc'} = "";
+		$printer->{currentqueue}{'loc'} = "";
+		$printer->{currentqueue}{'spooler'} =
+		    $printer->{SPOOLER};
+	    }
+	    $printer->{str_type}=$printer::printer_type_inv{$printer->{TYPE}};
+	    $printer->{str_type} = 
+		$in->ask_from_list_(_("Select Printer Connection"),
+				    _("How is the printer connected?"),
+				    [ printer::printer_type($printer) ],
+				    $printer->{str_type},
+				    ) or return;
+	    $printer->{TYPE} = $printer::printer_type{$printer->{str_type}};
+#	    if ($printer->{TYPE} eq 'REMOTE') {
+#		$printer->{str_type} = $printer::printer_type_inv{CUPS};
+#		$printer->{str_type} = 
+#		    $in->ask_from_list_(_("Select Remote Printer Connection"),
+#_("With a remote CUPS server, you do not have to configure
+#any printer here; printers will be automatically detected.
+#In case of doubt, select \"Remote CUPS server\"."),
+#					[ @printer::printer_type_inv{qw(CUPS LPD SOCKET)} ],
+#					$printer->{str_type},
+#					) or return;
+#		$printer->{TYPE} = $printer::printer_type{$printer->{str_type}};
+#	    }
+	    if ($printer->{TYPE} eq 'CUPS') {
+		#- hack to handle cups remote server printing,
+		#- first read /etc/cups/cupsd.conf for variable BrowsePoll address:port
+		my @cupsd_conf = printer::read_cupsd_conf();
+		my ($server, $port);
+		
+		foreach (@cupsd_conf) {
+		    /^\s*BrowsePoll\s+(\S+)/ and $server = $1, last;
+		}
+		$server =~ /([^:]*):(.*)/ and ($server, $port) = ($1, $2);
+		
+		#- then ask user for this combination
+		#- and rewrite /etc/cups/cupsd.conf according to new settings.
+		#- there are no other point where such information is written in this file.
+		if ($in->ask_from_entries_refH
+		    (_("Remote CUPS server"),
 _("With a remote CUPS server, you do not have to configure
 any printer here; printers will be automatically detected
 unless you have a server on a different network; in the
 latter case, you have to give the CUPS server IP address
-and optionally the port number."), [
-{ label => _("CUPS server IP"), val => \$server },
-{ label => _("Port"), val => \$port } ],
-						   complete => sub {
-						       unless (!$server || network::is_ip($server)) {
-							   $in->ask_warn('', _("IP address should be in format 1.2.3.4"));
-							   return (1,0);
-						       }
-						       if ($port !~ /^\d*$/) {
-							   $in->ask_warn('', _("Port number should be numeric"));
-							   return (1,1);
-						       }
-						       return 0;
-						   },
-						   )) {
-			$server && $port and $server = "$server:$port";
-			if ($server) {
-			    @cupsd_conf = map { $server and s/^\s*BrowsePoll\s+(\S+)/BrowsePoll $server/ and $server = '';
-						$_ } @cupsd_conf;
-			    $server and push @cupsd_conf, "\nBrowsePoll $server\n";
-			} else {
-			    @cupsd_conf = map { s/^\s*BrowsePoll\s+(\S+)/\#BrowsePoll $1/;
-						$_ } @cupsd_conf;
-			}
-		        printer::write_cupsd_conf(@cupsd_conf);
+and optionally the port number."),
+		     [
+		      { label => _("CUPS server IP"), val => \$server },
+		      { label => _("Port"), val => \$port } ],
+		     complete => sub {
+			 unless (!$server || network::is_ip($server)) {
+			     $in->ask_warn('', _("IP address should be in format 1.2.3.4"));
+			     return (1,0);
+			 }
+			 if ($port !~ /^\d*$/) {
+			     $in->ask_warn('', _("Port number should be numeric"));
+			     return (1,1);
+			 }
+			 return 0;
+		     },
+		     )) {
+		    $server && $port and $server = "$server:$port";
+		    if ($server) {
+			@cupsd_conf = map { $server and s/^\s*BrowsePoll\s+(\S+)/BrowsePoll $server/ and $server = '';
+					    $_ } @cupsd_conf;
+			$server and push @cupsd_conf, "\nBrowsePoll $server\n";
+		    } else {
+			@cupsd_conf = map { s/^\s*BrowsePoll\s+(\S+)/\#BrowsePoll $1/;
+					    $_ } @cupsd_conf;
 		    }
-		    return; #- exit printer configuration, here is another hack for simplification.
+		    printer::write_cupsd_conf(@cupsd_conf);
 		}
-		$in->set_help('configurePrinterLocal') if $::isInstall;
-		$in->ask_from_entries_refH_powered(
-                    { title => _("Select Printer Connection"),
-		      cancel => !$printer->{configured}{$printer->{QUEUE}} ? '' : _("Remove queue"),
-		      callbacks => { complete => sub {
-					 unless ($printer->{QUEUE} =~ /^\w+[\w\|]*\w+$/) {
-					     $in->ask_warn('', _("Name of printer should contains only letters, numbers and the underscore"));
-					     return (1,0);
-					 }
-					 return 0;
-				     },
-				   },
-		      messages =>
-_("Every printer need a name (for example lp).
-Other parameters such as the description of the printer or its location
-can be defined. What name should be used for this printer and
-how is the printer connected?") }, [
-{ label => _("Name of printer"), val => \$printer->{QUEUE} },
-{ label => _("Description"), val => \$printer->{Info} },
-{ label => _("Location"), val => \$printer->{Location} },
-                                   ]) or printer::remove_queue($printer), $continue = 1, last;
-	    } else {
-		if (!$::expert) {
-		    $printer->{str_type} = $in->ask_from_list_(_("Select Printer Connection"),
-							       _("How is the printer connected?"),
-							       [ printer::printer_type($printer) ],
-							       $printer->{str_type},
-							      ) or return;
-		} else {
-		    $in->set_help('configurePrinterLPR') if $::isInstall;
-		    $in->ask_from_entries_refH_powered(
-		        { title => _("Select Printer Connection"), 
-			  cancel => $::expert ? _("Remove queue") : '',
-			  messages =>
-_("Every print queue (which print jobs are directed to) needs a
-name (often lp) and a spool directory associated with it. What
-name and directory should be used for this queue and how is the printer connected?"),
-			  callbacks => { changed => sub {
-					     $printer->{SPOOLDIR} = printer::default_spooldir($printer) unless $_[0];
-					 } }
-		        }, [
-{ label => _("Name of queue"), val => \$printer->{QUEUE} },
-{ label => _("Spool directory"), val => \$printer->{SPOOLDIR} },
-{ label => _("Printer Connection"), val => \$printer->{str_type}, list => [ printer::printer_type($printer) ] },
-]) or printer::remove_queue($printer), $continue = 1, last;
-		}
-		$printer->{TYPE} = $printer::printer_type{$printer->{str_type}};
+		return; #- exit printer configuration, here is another hack for simplification.
 	    }
-
+	    # Name, description, location
+	    $in->set_help('configurePrinterLocal') if $::isInstall;
+	    $in->ask_from_entries_refH_powered
+		(
+		 { title => __("Enter Printer Name and Comments"),
+		   cancel => !$printer->{configured}{$queue} ? '' : _("Remove queue"),
+		   callbacks => { complete => sub {
+		       unless ($printer->{currentqueue}{'queue'} =~ /^\w+$/) {
+			   $in->ask_warn('', _("Name of printer should contain only letters, numbers and the underscore"));
+			   return (1,0);
+		       }
+		       return 0;
+		   },
+			      },
+		   messages =>
+__("Every printer needs a name (for example lp).
+The Description and Location fields do not need 
+to be filled in. They are comments for the users.") }, 
+		 [
+		  { label => _("Name of printer"),
+		    val => \$printer->{currentqueue}{'queue'} },
+		  { label => _("Description"),
+		    val => \$printer->{currentqueue}{'desc'} },
+		  { label => _("Location"),
+		    val => \$printer->{currentqueue}{'loc'} },
+		  ]) or 
+	    printer::remove_queue($printer, $printer->{currentqueue}{'queue'}),
+		      $continue = 1, last;
+
+	    $printer->{QUEUE} = $printer->{currentqueue}{'queue'};
 	    $continue = 0;
 	    for ($printer->{TYPE}) {
 		/LOCAL/     and setup_local    ($printer, $in, $install) and last;
-		/LPD/       and setup_remote   ($printer, $in, $install) and last;
+		/LPD/       and setup_lpd      ($printer, $in, $install) and last;
 		/SOCKET/    and setup_socket   ($printer, $in, $install) and last;
 		/SMB/       and setup_smb      ($printer, $in, $install) and last;
 		/NCP/       and setup_ncp      ($printer, $in, $install) and last;
 		/URI/       and setup_uri      ($printer, $in, $install) and last;
+		/POSTPIPE/  and setup_postpipe ($printer, $in, $install) and last;
 		$continue = 1; last;
 	    }
 	}
-
 	#- configure specific part according to lpr/cups.
 	if (!$continue && setup_gsdriver($printer, $in, $install, $printer->{TYPE} !~ /LOCAL/ && $upNetwork)) {
+	    if (lc($printer->{QUEUE}) ne lc($printer->{OLD_QUEUE})) {
+		printer::remove_queue($printer, $printer->{OLD_QUEUE});
+	    }
 	    delete $printer->{OLD_QUEUE}
-		if $printer->{QUEUE} ne $printer->{OLD_QUEUE} && $printer->{configured}{$printer->{QUEUE}};
+	    if $printer->{QUEUE} ne $printer->{OLD_QUEUE} && $printer->{configured}{$printer->{QUEUE}};
 	    $continue = $::expert;
 	} else {
 	    $continue = 1;
 	}
+	if ($continue) {
+	    # Reinitialize $printer data structure
+	    printer::resetinfo($printer);
+	}
     }
 }