From 8b288e6df423282c3a51f6775d5feadf12b796be Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Mon, 30 Jul 2001 18:41:02 +0000
Subject: In beginners mode one chooses only the printer, not the driver
 (default driver)

---
 perl-install/printerdrake.pm | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'perl-install/printerdrake.pm')

diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 18d368e78..9c9106e64 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -84,8 +84,7 @@ complete => sub {
     foreach (@parport) {
 	$device eq $_->{port} or next;
         $printer->{DBENTRY} =
-            bestMatchSentence($_->{val}{DESCRIPTION}, 
-            keys %printer::thedb);
+            bestMatchSentence ($_->{val}{DESCRIPTION}, keys %printer::thedb);
     }
     1;
 }
@@ -426,15 +425,40 @@ sub setup_gsdriver($$$;$) {
 		my $make = $printer->{configured}{$queue}{'make'};
 		my $model =
 		    $printer->{configured}{$queue}{'model'};
-		$printer->{DBENTRY} = "$make|$model|$driverstr";
-	    } elsif ($printer->{SPOOLER} eq "cups") {
+		if ($::expert) {
+		    $printer->{DBENTRY} = "$make|$model|$driverstr";
+		    # database key contains te "(recommended)" for the
+		    # recommended driver, so add it if necessary
+		    if (!($printer::thedb{$printer->{DBENTRY}}{id})) {
+			$printer->{DBENTRY} .= " (recommended)";
+		    }
+		} else {
+		    $printer->{DBENTRY} = "$make|$model";
+		    # Make sure that we use the recommended driver
+		    $printer->{currentqueue}{'driver'} =
+			$printer::thedb{$printer->{DBENTRY}}{driver};
+		}
+	    } elsif (($::expert) && ($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};
 	    }
+        } else {
+	    if (($::expert) && ($printer->{DBENTRY} !~ (recommended))) {
+		$printer->{DBENTRY} =~ /^([^\|]+)\|([^\|]+)\|/;
+		my $make = $1;
+		my $model = $2;
+		my $key;
+		for $key (keys %printer::thedb) {
+		    if ($key =~ /^$make\|$model\|.*\(recommended\)$/) {
+			$printer->{DBENTRY} = $key;
+		    }
+		}
+	    }
 	}
 	# 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?"), '|',
-- 
cgit v1.2.1