From 45a8f2704e6b1f9760b86c2bb6748c546fb38f32 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Wed, 1 Aug 2001 18:17:15 +0000
Subject: Fixed bug in recognizing the printer ID in the Foomatic overview.

---
 perl-install/printer.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index 59c5b0c2e..59f4ce9a0 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -1,10 +1,10 @@
 package printer;
 # $Id$
 
-use diagnostics;
-use strict;
 
-use vars qw(%thedb %spooler %spooler_inv %printer_type %printer_type_inv @entries_db_short @entry_db_description %descr_to_help %descr_to_db %db_to_descr %descr_to_ppd);
+
+
+
 
 use common;
 use commands;
@@ -226,7 +226,7 @@ sub read_printer_db(;$) {
 			}
 		    }
 		    $entry = {};
-		} elsif (m!^\s*<id>\s*([0-9]+)\s*</id>\s*$!) {
+		} elsif (m!^\s*<id>\s*([^\s<>]+)\s*</id>\s*$!) {
 		    # Foomatic printer ID
 		    $entry->{id} = $1;
 		} elsif (m!^\s*<make>(.+)</make>\s*$!) {
-- 
cgit v1.2.1