[1861] in Moira Commits
/svn/moira r4005 - trunk/moira/gen
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Tue May 18 14:39:33 2010
Date: Tue, 18 May 2010 14:39:27 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201005181839.o4IIdRBa023914@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-05-18 14:39:27 -0400 (Tue, 18 May 2010)
New Revision: 4005
Modified:
trunk/moira/gen/cups-cluster.pc
trunk/moira/gen/cups-print.pc
Log:
check serverhosts table
Modified: trunk/moira/gen/cups-cluster.pc
===================================================================
--- trunk/moira/gen/cups-cluster.pc 2010-05-18 15:55:52 UTC (rev 4004)
+++ trunk/moira/gen/cups-cluster.pc 2010-05-18 18:39:27 UTC (rev 4005)
@@ -322,9 +322,10 @@
SELECT pr.rp, pr.name, pr.duplexname, pr.hwtype,
m.name, pr.banner, pr.location, pr.contact, pr.ka,
pr.ac, pr.lpc_acl, m.name, pr.duplexdefault as cupshosts
- FROM printers pr, machine m, machine m2
+ FROM printers pr, machine m, machine m2, serverhosts sh
WHERE pr.rm = m.mach_id
AND pr.status = 1 AND pr.mach_id = m2.mach_id AND m2.status != 3
+ AND sh.service = 'PRINT' AND m.mach_id = sh.mach_id
AND (pr.type = 'DORM' or pr.type = 'CLUSTER');
EXEC SQL OPEN csr_lprng_printers;
Modified: trunk/moira/gen/cups-print.pc
===================================================================
--- trunk/moira/gen/cups-print.pc 2010-05-18 15:55:52 UTC (rev 4004)
+++ trunk/moira/gen/cups-print.pc 2010-05-18 18:39:27 UTC (rev 4005)
@@ -326,8 +326,9 @@
SELECT pr.rp, pr.name, pr.duplexname, pr.hwtype,
m.name, pr.banner, pr.location, pr.contact, pr.ka,
pr.ac, pr.lpc_acl, m.name, pr.duplexdefault as cupshosts
- FROM printers pr, machine m, machine m2
+ FROM printers pr, machine m, machine m2, serverhosts sh
WHERE pr.rm = m.mach_id
+ AND sh.service = 'PRINT' AND m.mach_id = sh.mach_id
AND pr.status = 1 AND pr.mach_id = m2.mach_id AND m2.status != 3
AND pr.type != 'ALIAS';
