summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2001-09-22 02:34:55 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2001-09-22 02:34:55 +0000
commitd0ef4689c2a5006e2cf3664ebc45a813dbfcc86b (patch)
tree693d2ed0bc77c4a282f990eb2011f24dd7fd030a /perl-install
parent631735f6b97e639d7c9728c7dcd7319ee0d29f18 (diff)
downloaddrakx-backup-do-not-use-d0ef4689c2a5006e2cf3664ebc45a813dbfcc86b.tar
drakx-backup-do-not-use-d0ef4689c2a5006e2cf3664ebc45a813dbfcc86b.tar.gz
drakx-backup-do-not-use-d0ef4689c2a5006e2cf3664ebc45a813dbfcc86b.tar.bz2
drakx-backup-do-not-use-d0ef4689c2a5006e2cf3664ebc45a813dbfcc86b.tar.xz
drakx-backup-do-not-use-d0ef4689c2a5006e2cf3664ebc45a813dbfcc86b.zip
Improved matching of auto-detection results with database entries.
Given hint to the user to select the correct model when matching fails.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/printerdrake.pm48
1 files changed, 38 insertions, 10 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index d913553a6..912edc4c6 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -216,7 +216,7 @@ sub auto_detect {
{
my $w = $in->wait_message(_("Test ports"), _("Detecting devices ..."));
modules::get_alias("usb-interface") and eval { modules::load("printer"); sleep(2); };
- foreach (qw(parport_pc lp parport_probe parport)) {
+ foreach (qw(lp parport_pc parport_probe parport)) {
eval { modules::unload($_); }; #- on kernel 2.4 parport has to be unloaded to probe again
}
foreach (qw(parport_pc lp parport_probe)) {
@@ -278,12 +278,28 @@ complete => sub {
#- Search the database entry which matches the detected printer best
foreach (@parport) {
$device eq $_->{port} or next;
+ my $descr = $_->{val}{DESCRIPTION};
+ # Clean up the description from noise which makes the best match
+ # difficult
+ $descr =~ s/\s+Inc\.//;
+ $descr =~ s/\s+Corp\.//;
+ $descr =~ s/\s+SA\.//;
+ $descr =~ s/\s+S\.\s*A\.//;
+ $descr =~ s/\s+Ltd\.//;
+ $descr =~ s/\s+International//;
+ $descr =~ s/\s+Int\.//;
+ $descr =~ s/\s+\(?[Pp]rinter\)?$//;
+
$printer->{DBENTRY} =
- bestMatchSentence ($_->{val}{DESCRIPTION}, keys %printer::thedb);
+ bestMatchSentence ($descr, keys %printer::thedb);
# If the manufacturer was not guessed correctly, discard the
# guess.
- #$printer->{DBENTRY} =~ /^([\|])|/;
- #if ($_->{val}{DESCRIPTION} !~ /lc($1)/i) {$printer->{DBENTRY} = ""};
+ $printer->{DBENTRY} =~ /^([^\|]+)\|/;
+ my $guessedmake = lc($1);
+ if (($descr !~ /$guessedmake/i) &&
+ (($guessedmake ne "hp") ||
+ ($descr !~ /Hewlett[\s-]+Packard/i)))
+ {$printer->{DBENTRY} = ""};
}
1;
}
@@ -743,7 +759,7 @@ sub get_db_entry {
}
if ($printer->{DBENTRY} eq "") {
# Exact match of make and model did not work, try to clean
- # ups the model name
+ # up the model name
$model =~ s/PS//;
$model =~ s/PostScript//;
$model =~ s/Series//;
@@ -754,13 +770,18 @@ sub get_db_entry {
}
}
}
- if (($printer->{DBENTRY} eq "") && 0) {
+ if (($printer->{DBENTRY} eq "") && ($make ne "")) {
# Exact match with cleaned-up model did not work, try a best match
- $printer->{DBENTRY} = bestMatchSentence("$make|$model", keys %printer::thedb);
+ my $matchstr = "$make|$model";
+ $printer->{DBENTRY} = bestMatchSentence($matchstr, keys %printer::thedb);
# If the manufacturer was not guessed correctly, discard the
# guess.
- $printer->{DBENTRY} =~ /^([\|])|/;
- if (lc($1) ne lc($make)) {$printer->{DBENTRY} = ""};
+ $printer->{DBENTRY} =~ /^([^\|]+)\|/;
+ my $guessedmake = lc($1);
+ if (($matchstr !~ /$guessedmake/i) &&
+ (($guessedmake ne "hp") ||
+ ($matchstr !~ /Hewlett[\s-]+Packard/i)))
+ {$printer->{DBENTRY} = ""};
}
# Set the OLD_CHOICE to a non-existing value
$printer->{OLD_CHOICE} = "XXX";
@@ -791,7 +812,14 @@ sub choose_model {
}
# Choose the printer/driver from the list
return ($printer->{DBENTRY} = $in->ask_from_treelist(_("Printer model selection"),
- _("Which printer model do you have?"), '|',
+ _("Which printer model do you have?") .
+ _("
+
+Please check whether Printerdrake did the
+auto-detection of your printer model
+correctly. Search the correct model in the
+list when the cursor is standing on a
+wrong model or on \"Raw printer\"."), '|',
[ keys %printer::thedb ], $printer->{DBENTRY}));
}