Skip to content

Commit 2e6f14b

Browse files
tillkamppetertillkamppeter
authored
Merge pull request #7 from OniLink/master
Removed approval tables
2 parents 7f771e5 + 0cb90ea commit 2e6f14b

2 files changed

Lines changed: 15 additions & 211 deletions

File tree

‎lib/Foomatic/DB.pm‎

Lines changed: 15 additions & 189 deletions
Original file line numberDiff line numberDiff line change
@@ -120,106 +120,6 @@ sub disconnect_from_sql_db {
120120
}
121121
}
122122

123-
sub printer_approved_in_sql_db {
124-
my ($this, $pid) = @_;
125-
if ($this->{'dbh'} && $this->{'dbtype'} eq 'mysql') {
126-
# Get list of approval state of printer
127-
my $unapprovedprinterquerystr =
128-
"SELECT id FROM printer_approval " .
129-
"WHERE id=\"$pid\" AND " .
130-
"(approved IS NULL OR approved=0 OR approved='' OR " .
131-
"(rejected IS NOT NULL AND rejected!=0 AND rejected!='') OR " .
132-
"(showentry IS NOT NULL AND showentry!='' AND showentry!=1 AND " .
133-
"showentry>CAST(NOW() AS DATE)));";
134-
my $sth = $this->{'dbh'}->prepare($unapprovedprinterquerystr);
135-
if ($sth->execute()) {
136-
my @row = $sth->fetchrow_array;
137-
return 0 if ($row[0]);
138-
return 1;
139-
} else {
140-
return 1;
141-
}
142-
} else {
143-
return 1;
144-
}
145-
}
146-
147-
sub driver_approved_in_sql_db {
148-
my ($this, $driver) = @_;
149-
if ($this->{'dbh'} && $this->{'dbtype'} eq 'mysql') {
150-
# Get list of approval state of driver
151-
my $unapproveddriverquerystr =
152-
"SELECT id FROM driver_approval " .
153-
"WHERE id=\"$driver\" AND " .
154-
"(approved IS NULL OR approved=0 OR approved='' OR " .
155-
"(rejected IS NOT NULL AND rejected!=0 AND rejected!='') OR " .
156-
"(showentry IS NOT NULL AND showentry!='' AND showentry!=1 AND " .
157-
"showentry>CAST(NOW() AS DATE)));";
158-
my $sth = $this->{'dbh'}->prepare($unapproveddriverquerystr);
159-
if ($sth->execute()) {
160-
my @row = $sth->fetchrow_array;
161-
return 0 if ($row[0]);
162-
return 1;
163-
} else {
164-
return 1;
165-
}
166-
} else {
167-
return 1;
168-
}
169-
}
170-
171-
sub get_unapproved_printers_from_sql_db {
172-
my ($this) = @_;
173-
if ($this->{'dbh'} && $this->{'dbtype'} eq 'mysql') {
174-
# Get list of unapproved printers
175-
my $unapprovedprinterquerystr =
176-
"SELECT id FROM printer_approval " .
177-
"WHERE (approved IS NULL OR approved=0 OR approved='' OR " .
178-
"(rejected IS NOT NULL AND rejected!=0 AND rejected!='') OR " .
179-
"(showentry IS NOT NULL AND showentry!='' AND showentry!=1 AND " .
180-
"showentry>CAST(NOW() AS DATE))) " .
181-
"ORDER BY id;";
182-
my $sth = $this->{'dbh'}->prepare($unapprovedprinterquerystr);
183-
if ($sth->execute()) {
184-
my @upl = ();
185-
while (my @row = $sth->fetchrow_array) {
186-
push(@upl, $row[0]);
187-
}
188-
return @upl;
189-
} else {
190-
return ();
191-
}
192-
} else {
193-
return ();
194-
}
195-
}
196-
197-
sub get_unapproved_drivers_from_sql_db {
198-
my ($this) = @_;
199-
if ($this->{'dbh'} && $this->{'dbtype'} eq 'mysql') {
200-
# Get list of unapproved drivers
201-
my $unapproveddriverquerystr =
202-
"SELECT id FROM driver_approval " .
203-
"WHERE (approved IS NULL OR approved=0 OR approved='' OR " .
204-
"(rejected IS NOT NULL AND rejected!=0 AND rejected!='') OR " .
205-
"(showentry IS NOT NULL AND showentry!='' AND showentry!=1 AND " .
206-
"showentry>CAST(NOW() AS DATE))) " .
207-
"ORDER BY id;";
208-
my $sth = $this->{'dbh'}->prepare($unapproveddriverquerystr);
209-
if ($sth->execute()) {
210-
my @udl = ();
211-
while (my @row = $sth->fetchrow_array) {
212-
push(@udl, $row[0]);
213-
}
214-
return @udl;
215-
} else {
216-
return ();
217-
}
218-
} else {
219-
return ();
220-
}
221-
}
222-
223123
sub get_translation_from_sql_db {
224124
my ($this, $table, $pkeys, $fields) = @_;
225125
if ($this->{'dbh'} &&
@@ -337,8 +237,6 @@ sub get_overview_from_sql_db {
337237
my ($this, $cupsppds, $speedmode) = @_;
338238
$speedmode = 0 if !$speedmode;
339239
if ($this->{'dbh'}) {
340-
my @upl = $this->get_unapproved_printers_from_sql_db();
341-
my @udl = $this->get_unapproved_drivers_from_sql_db();
342240
my $printerquerystr = "SELECT printer.id, " .
343241
"printer.make, printer.model, printer.functionality, " .
344242
"printer.unverified, printer.default_driver, " .
@@ -395,14 +293,10 @@ sub get_overview_from_sql_db {
395293
"driver_printer_assoc.driver_id;";
396294
$sthd = $this->{'dbh'}->prepare($driverquerystr);
397295
$sthd->execute();
398-
do {
399-
@drow = $sthd->fetchrow_array;
400-
} while (@udl && @drow && member($drow[1], @udl));
296+
@drow = $sthd->fetchrow_array;
401297
}
402298
my @prow;
403-
do {
404-
@prow = $sthp->fetchrow_array;
405-
} while (@upl && @prow && member($prow[0], @upl));
299+
@prow = $sthp->fetchrow_array;
406300
my $overview = [];
407301
while ( 1 ) {
408302
last if !@prow && !@drow;
@@ -475,9 +369,7 @@ sub get_overview_from_sql_db {
475369
if defined($prow[25]) && ($prow[25] ne "");
476370

477371
# Current row in printer list treated, advance
478-
do {
479-
@prow = $sthp->fetchrow_array;
480-
} while (@upl && @prow && member($prow[0], @upl));
372+
@prow = $sthp->fetchrow_array;
481373
}
482374

483375
# Fill make and model fields if there was no appropriate
@@ -607,9 +499,7 @@ sub get_overview_from_sql_db {
607499
}
608500

609501
# Current row in printer/driver list treated, advance
610-
do {
611-
@drow = $sthd->fetchrow_array;
612-
} while (@udl && @drow && member($drow[1], @udl));
502+
@drow = $sthd->fetchrow_array;
613503
}
614504
} else {
615505
# There is no driver for this printer. Skip this printer
@@ -632,7 +522,6 @@ sub get_driverlist_from_sql_db {
632522
my ($this) = @_;
633523
if ($this->{'dbh'}) {
634524
if (!defined($this->{"names-source/driver"})) {
635-
my @udl = $this->get_unapproved_drivers_from_sql_db();
636525
# Get driver list
637526
my $driverquerystr =
638527
"SELECT id " .
@@ -641,8 +530,7 @@ sub get_driverlist_from_sql_db {
641530
$sth->execute();
642531
$this->{"names-source/driver"} = [];
643532
while (my @row = $sth->fetchrow_array) {
644-
push(@{$this->{"names-source/driver"}}, $row[0]) if
645-
(!@udl || !member($row[0], @udl));
533+
push(@{$this->{"names-source/driver"}}, $row[0]);
646534
}
647535
}
648536
}
@@ -653,7 +541,6 @@ sub get_printerlist_from_sql_db {
653541
my ($this) = @_;
654542
if ($this->{'dbh'}) {
655543
if (!defined($this->{"names-source/printer"})) {
656-
my @upl = $this->get_unapproved_printers_from_sql_db();
657544
# Get printer list
658545
my $printerquerystr =
659546
"SELECT id " .
@@ -662,8 +549,7 @@ sub get_printerlist_from_sql_db {
662549
$sth->execute();
663550
$this->{"names-source/printer"} = [];
664551
while (my @row = $sth->fetchrow_array) {
665-
push(@{$this->{"names-source/printer"}}, $row[0]) if
666-
(!@upl || !member($row[0], @upl));
552+
push(@{$this->{"names-source/printer"}}, $row[0]);
667553
}
668554
}
669555
}
@@ -674,7 +560,6 @@ sub get_printer_from_sql_db {
674560
my ($this, $poid, $nodriverlist) = @_;
675561
my $pentry;
676562
if ($this->{'dbh'}) {
677-
return undef if !$this->printer_approved_in_sql_db($poid);
678563
# Get printer record
679564
my $printerquerystr =
680565
"SELECT * " .
@@ -887,7 +772,6 @@ sub get_driver_from_sql_db {
887772
my ($this, $driver, $noprinterlist) = @_;
888773
my $dentry;
889774
if ($this->{'dbh'}) {
890-
return undef if !$this->driver_approved_in_sql_db($driver);
891775
# Get driver record
892776
my $driverquerystr =
893777
"SELECT * " .
@@ -1092,30 +976,10 @@ sub make_exists_in_sql_db {
1092976
# Check whether a printer entry for this make exists in the database
1093977
if ($this->{'dbh'}) {
1094978
my $printerquerystr;
1095-
my @upl = $this->get_unapproved_printers_from_sql_db();
1096-
if (@upl) {
1097-
$printerquerystr =
1098-
"SELECT id " .
1099-
"FROM printer LEFT JOIN printer_approval " .
1100-
"ON printer.id=printer_approval.id " .
1101-
"WHERE printer.make=\"$make\" AND " .
1102-
"(printer_approval.id IS NULL OR " .
1103-
"(printer_approval.approved IS NOT NULL AND " .
1104-
"printer_approval.approved!=0 AND " .
1105-
"printer_approval.approved!='' AND " .
1106-
"(printer_approval.rejected IS NULL OR " .
1107-
"printer_approval.rejected=0 OR " .
1108-
"printer_approval.rejected='') AND " .
1109-
"(printer_approval.showentry IS NULL OR " .
1110-
"printer_approval.showentry='' OR " .
1111-
"printer_approval.showentry=1 OR " .
1112-
"printer_approval.showentry<=CAST(NOW() AS DATE))));";
1113-
} else {
1114-
$printerquerystr =
1115-
"SELECT id " .
1116-
"FROM printer " .
1117-
"WHERE make=\"$make\";";
1118-
}
979+
$printerquerystr =
980+
"SELECT id " .
981+
"FROM printer " .
982+
"WHERE make=\"$make\";";
1119983
my $sth = $this->{'dbh'}->prepare($printerquerystr);
1120984
$sth->execute();
1121985
my @prow = $sth->fetchrow_array;
@@ -1130,7 +994,6 @@ sub printer_exists_in_sql_db {
1130994
my ($this, $poid) = @_;
1131995
# Check whether a printer entry exists in the database
1132996
if ($this->{'dbh'}) {
1133-
return undef if !$this->printer_approved_in_sql_db($poid);
1134997
# Get printer record
1135998
my $printerquerystr =
1136999
"SELECT id " .
@@ -1150,7 +1013,6 @@ sub driver_exists_in_sql_db {
11501013
my ($this, $drv) = @_;
11511014
# Check whether a driver entry exists in the database
11521015
if ($this->{'dbh'}) {
1153-
return undef if !$this->driver_approved_in_sql_db($drv);
11541016
# Get driver record
11551017
my $driverquerystr =
11561018
"SELECT id " .
@@ -1170,8 +1032,6 @@ sub get_printers_for_driver_from_sql_db {
11701032
my ($this, $drv) = @_;
11711033
my @printerlist = ();
11721034
if ($this->{'dbh'}) {
1173-
return () if !$this->driver_approved_in_sql_db($drv);
1174-
my @upl = $this->get_unapproved_printers_from_sql_db();
11751035
# Get printer IDs of printer/driver combos with the given driver
11761036
my $querystr =
11771037
"SELECT printer_id " .
@@ -1180,8 +1040,7 @@ sub get_printers_for_driver_from_sql_db {
11801040
my $sth = $this->{'dbh'}->prepare($querystr);
11811041
$sth->execute();
11821042
while (my @row = $sth->fetchrow_array) {
1183-
push(@printerlist, $row[0]) if
1184-
(!@upl || !member($row[0], @upl));
1043+
push(@printerlist, $row[0]);
11851044
}
11861045
}
11871046
return @printerlist;
@@ -1191,8 +1050,6 @@ sub get_drivers_for_printer_from_sql_db {
11911050
my ($this, $poid) = @_;
11921051
my @driverlist = ();
11931052
if ($this->{'dbh'}) {
1194-
return () if !$this->printer_approved_in_sql_db($poid);
1195-
my @udl = $this->get_unapproved_drivers_from_sql_db();
11961053
# Get drivers of printer/driver combos with the given printer ID
11971054
my $querystr =
11981055
"SELECT driver_id " .
@@ -1202,8 +1059,7 @@ sub get_drivers_for_printer_from_sql_db {
12021059
$sth->execute();
12031060

12041061
while (my @row = $sth->fetchrow_array) {
1205-
push(@driverlist, $row[0]) if
1206-
(!@udl || !member($row[0], @udl));
1062+
push(@driverlist, $row[0]);
12071063
}
12081064
}
12091065
return @driverlist;
@@ -1213,14 +1069,6 @@ sub get_combo_data_from_sql_db {
12131069
my ($this, $drv, $poid) = @_;
12141070
my $dat = undef;
12151071
if ($this->{'dbh'}) {
1216-
#Do this printer and driver exist?
1217-
if ( !$this->printer_approved_in_sql_db($poid)
1218-
|| !$this->driver_approved_in_sql_db($drv) ) {
1219-
$this->{'log'} =
1220-
"Error: Either $poid or $drv does not exist in the sql db";
1221-
return undef;
1222-
}
1223-
12241072
# Is this printer/driver combo valid?
12251073
my $querystr =
12261074
"SELECT max_res_x, max_res_y, color, text, lineart, graphics, " .
@@ -1556,28 +1404,8 @@ sub get_makes_from_sql_db {
15561404
if ($this->{'dbh'}) {
15571405
# Get list of manufacturers
15581406
my $querystr;
1559-
my @upl = $this->get_unapproved_printers_from_sql_db();
1560-
if (@upl) {
1561-
$querystr =
1562-
"SELECT make " .
1563-
"FROM printer LEFT JOIN printer_approval " .
1564-
"ON printer.id=printer_approval.id " .
1565-
"WHERE (printer_approval.id IS NULL OR " .
1566-
"(printer_approval.approved IS NOT NULL AND " .
1567-
"printer_approval.approved!=0 AND " .
1568-
"printer_approval.approved!='' AND " .
1569-
"(printer_approval.rejected IS NULL OR " .
1570-
"printer_approval.rejected=0 OR " .
1571-
"printer_approval.rejected='') AND " .
1572-
"(printer_approval.showentry IS NULL OR " .
1573-
"printer_approval.showentry='' OR " .
1574-
"printer_approval.showentry=1 OR " .
1575-
"printer_approval.showentry<=CAST(NOW() AS DATE)))) " .
1576-
"GROUP BY make ORDER BY make;";
1577-
} else {
1578-
$querystr =
1579-
"SELECT make FROM printer GROUP BY make ORDER BY make;";
1580-
}
1407+
$querystr =
1408+
"SELECT make FROM printer GROUP BY make ORDER BY make;";
15811409
my $sth = $this->{'dbh'}->prepare($querystr);
15821410
$sth->execute();
15831411
while (my @row = $sth->fetchrow_array) {
@@ -1591,15 +1419,13 @@ sub get_models_by_make_from_sql_db {
15911419
my ($this, $wantmake) = @_;
15921420
my @models;
15931421
if ($this->{'dbh'}) {
1594-
my @upl = $this->get_unapproved_printers_from_sql_db();
15951422
# Get list of models for a given manufacturer
15961423
my $querystr =
15971424
"SELECT id, model FROM printer WHERE make=\"$wantmake\";";
15981425
my $sth = $this->{'dbh'}->prepare($querystr);
15991426
$sth->execute();
16001427
while (my @row = $sth->fetchrow_array) {
1601-
push(@models, $row[1]) if
1602-
(!@upl || !member($row[0], @upl));
1428+
push(@models, $row[1]);
16031429
}
16041430
}
16051431
return @models;

‎lib/Foomatic/filters/phonebook.pm‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -466,34 +466,12 @@ my $schemaPhonebook =
466466
"description" text,
467467
CONSTRAINT "driver_support_contact_translation_ibfk_1" FOREIGN KEY ("driver_id", "url", "level") REFERENCES "driver_support_contact" ("driver_id", "url", "level") ON DELETE CASCADE
468468
)',
469-
'driver_approval' => 'CREATE TABLE "driver_approval" (
470-
"id" varchar(50) NOT NULL,
471-
"contributor" varchar(40) DEFAULT NULL,
472-
"submitted" datetime DEFAULT NULL,
473-
"showentry" datetime DEFAULT NULL,
474-
"approved" datetime DEFAULT NULL,
475-
"rejected" datetime DEFAULT NULL,
476-
"approver" varchar(40) DEFAULT NULL,
477-
"comment" text,
478-
CONSTRAINT "driver_approval_ibfk_1" FOREIGN KEY ("id") REFERENCES "driver" ("id") ON DELETE CASCADE
479-
)',
480469
'driver_dependency' => 'CREATE TABLE "driver_dependency" (
481470
"driver_id" varchar(50) NOT NULL,
482471
"required_driver" varchar(50) NOT NULL,
483472
"version" varchar(50) DEFAULT NULL,
484473
CONSTRAINT "driver_dependency_ibfk_1" FOREIGN KEY ("driver_id") REFERENCES "driver" ("id") ON DELETE CASCADE
485474
)',
486-
'printer_approval' => 'CREATE TABLE "printer_approval" (
487-
"id" varchar(50) NOT NULL,
488-
"contributor" varchar(40) DEFAULT NULL,
489-
"submitted" datetime DEFAULT NULL,
490-
"showentry" datetime DEFAULT NULL,
491-
"approved" datetime DEFAULT NULL,
492-
"rejected" datetime DEFAULT NULL,
493-
"approver" varchar(40) DEFAULT NULL,
494-
"comment" text,
495-
CONSTRAINT "printer_approval_ibfk_1" FOREIGN KEY ("id") REFERENCES "printer" ("id") ON DELETE CASCADE
496-
)',
497475
'driver_package' => 'CREATE TABLE "driver_package" (
498476
"driver_id" varchar(50) NOT NULL,
499477
"scope" varchar(255) NOT NULL,

0 commit comments

Comments
 (0)