From: zacheiss <zacheiss>
Date: Thu, 5 Nov 2009 22:12:02 +0000 (+0000)
Subject: Make update_printer work.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/542afef16f6296f898af3b6505f927a87c9f9f3c

Make update_printer work.
---

diff --git a/server/qfollow.pc b/server/qfollow.pc
index 6ae39f92..480d287f 100644
--- a/server/qfollow.pc
+++ b/server/qfollow.pc
@@ -42,12 +42,16 @@ EXEC SQL WHENEVER SQLERROR DO dbmserr();
 int set_modtime(struct query *q, char *argv[], client *cl)
 {
   char *name, *entity, *table;
-  int who;
+  int who, row = 0;
 
   entity = cl->entity;
   who = cl->client_id;
   table = table_name[q->rtable];
-  name = argv[0];
+
+  if (q->type == MR_Q_UPDATE)
+    row = 1;
+
+  name = argv[0 + row];
 
   sprintf(stmt_buf, "UPDATE %s SET modtime = SYSDATE, modby = %d, "
 	  "modwith = '%s' WHERE name = '%s'", table, who, entity, name);
diff --git a/server/queries2.c b/server/queries2.c
index 10436cbd..43c6d97a 100644
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -7445,11 +7445,11 @@ struct query Queries[] = {
     MR_Q_UPDATE,
     "pr",
     PRINTERS_TABLE,
-    "printers SET name = '%s', type = '%s', hwtype = '%s', duplexname = NVL('%s', CHR(0)), mach_id = %d, loghost = %d, rm = %d, rp = NVL('%s', CHR(0)), rq = %d, ka = %d, pc = %d, ac = %d, lpc_acl = %d, banner = %d, location = NVL('%s', CHR(0)), contact = NVL('%s', CHR(0))",
+    "printers SET name = '%s', type = '%s', hwtype = '%s', duplexname = NVL('%s', CHR(0)), mach_id = %d, loghost = %d, rm = %d, rp = NVL('%s', CHR(0)), rq = %d, ka = %s, pc = %s, ac = %d, lpc_acl = %d, banner = %s, location = NVL('%s', CHR(0)), contact = NVL('%s', CHR(0))",
     uprn_fields,
     16,
-    0,
-    0,
+    "name = '%s'",
+    1,
     NULL,
     &uprn_validate,
   },