[1853] in Moira Commits
/svn/moira r3999 - trunk/moira/gen
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Mon Apr 12 15:24:10 2010
Date: Mon, 12 Apr 2010 15:24:03 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201004121924.o3CJO3u0012175@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-04-12 15:24:03 -0400 (Mon, 12 Apr 2010)
New Revision: 3999
Modified:
trunk/moira/gen/cups-cluster.pc
trunk/moira/gen/cups-print.pc
Log:
Publish all printers.
Modified: trunk/moira/gen/cups-cluster.pc
===================================================================
--- trunk/moira/gen/cups-cluster.pc 2010-04-05 19:11:46 UTC (rev 3998)
+++ trunk/moira/gen/cups-cluster.pc 2010-04-12 19:24:03 UTC (rev 3999)
@@ -321,13 +321,11 @@
EXEC SQL DECLARE csr_lprng_printers CURSOR FOR
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 as cupshosts, pr.duplexdefault
- 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 (pr.type = 'DORM' or pr.type = 'CLUSTER') AND m.name <> :spoolhost AND
- m.mach_id = sh.mach_id AND sh.service = 'PRINT' AND
- sh.enable = 1;
+ pr.ac, pr.lpc_acl, m.name, pr.duplexdefault as cupshosts
+ FROM printers pr, machine m, machine m2
+ WHERE pr.rm = m.mach_id
+ AND pr.status = 1 AND pr.mach_id = m2.mach_id AND m2.status != 3
+ AND (pr.type = 'DORM' or pr.type = 'CLUSTER');
EXEC SQL OPEN csr_lprng_printers;
while (1)
Modified: trunk/moira/gen/cups-print.pc
===================================================================
--- trunk/moira/gen/cups-print.pc 2010-04-05 19:11:46 UTC (rev 3998)
+++ trunk/moira/gen/cups-print.pc 2010-04-12 19:24:03 UTC (rev 3999)
@@ -326,12 +326,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, serverhosts sh
- WHERE pr.rm = m.mach_id
+ FROM printers pr, machine m, machine m2
+ WHERE pr.rm = m.mach_id
AND pr.status = 1 AND pr.mach_id = m2.mach_id AND m2.status != 3
- AND pr.type != 'ALIAS' AND m.name <> :spoolhost AND
- m.mach_id = sh.mach_id AND sh.service = 'PRINT' AND
- sh.enable = 1;
+ AND pr.type != 'ALIAS';
EXEC SQL OPEN csr_lprng_printers;
while (1)
