[1795] in Moira
gmnm change
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Sun May 20 00:29:45 2001
Message-Id: <200105200429.AAA04529@riff-raff.mit.edu>
To: moiradev@MIT.EDU
Date: Sun, 20 May 2001 00:29:42 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
It occured to me that gmnm would be more like gmcm if it
returned both the machine name and the cluster name; this patch
implements that.
Garry
Index: queries2.c
===================================================================
RCS file: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/server/queries2.c,v
retrieving revision 2.84
diff -u -r2.84 queries2.c
--- queries2.c 2001/05/02 21:44:13 2.84
+++ queries2.c 2001/05/20 04:18:31
@@ -3243,6 +3243,11 @@
set_mach_modtime_by_id,
};
+static char *gmnm_fields[] = {
+ "machine",
+ "machine", "container",
+};
+
static char *gmoc_fields[] = {
"container",
"isrecursive",
@@ -6709,9 +6714,9 @@
RETRIEVE,
"mcn",
MCNTMAP_TABLE,
- "c.name FROM machine m, containers c, mcntmap mcn",
- amcn_fields,
- 1,
+ "m.name, c.name FROM machine m, containers c, mcntmap mcn",
+ gmnm_fields,
+ 2,
"m.name = UPPER('%s') AND mcn.cnt_id = c.cnt_id AND mcn.mach_id = m.mach_id",
1,
NULL,
