X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/4c9d1fd326a957310a949460cb48c51e7c5def7e..refs/heads/ip-billing-dev:/server/queries2.c

diff --git a/server/queries2.c b/server/queries2.c
index a5be68bb..a7557913 100644
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -819,6 +819,14 @@ static char *ghbh_fields[] = {
   "inuse", "modtime", "modby", "modwith",
 };
 
+static char *ghba_fields[] = {
+  "account_number",
+  "name", "vendor", "model", "os", "location", "contact", "billing_contact",
+  "account_number", "use", "status", "status_change", "network", "address", 
+  "ace_type", "ace_name", "admin_comment", "ops_comment", "created", "creator",
+  "inuse", "modtime", "modby", "modwith",
+};
+
 static struct validate ghst_validate = {
   0,
   0,
@@ -1151,8 +1159,9 @@ static char *gsnt2_fields[] = {
 
 static char *gsnt_fields[] = {
   "name",
-  "name", "description", "status", "address", "mask", "low", "high", "prefix",
-  "ace_type", "ace_name", "modtime", "modby", "modwith"
+  "name", "description", "status", "contact", "account_number", "address", 
+  "mask", "low", "high", "prefix", "ace_type", "ace_name", "modtime", 
+  "modby", "modwith"
 };
 
 static struct validate gsnt_validate = {
@@ -1198,27 +1207,29 @@ static struct validate asnt2_validate =
 };
 
 static char *asnt_fields[] = {
-  "name", "description", "status", "address", "mask", "low", "high", "prefix",
-  "ace_type", "ace_name",
+  "name", "description", "status", "contact", "account_number", "address", 
+  "mask", "low", "high", "prefix", "ace_type", "ace_name",
 };
 
 static struct valobj asnt_valobj[] = {
   {V_CHAR, 0, SUBNET_TABLE, "name"},
   {V_LEN, 1, SUBNET_TABLE, "description"},
   {V_NUM, 2},
-  {V_NUM, 3},
-  {V_NUM, 4},
+  {V_CHAR, 3, SUBNET_TABLE, "contact"},
+  {V_CHAR, 4, SUBNET_TABLE, "account_number"},
   {V_NUM, 5},
   {V_NUM, 6},
-  {V_LEN, 7, SUBNET_TABLE, "prefix"},
-  {V_TYPE, 8, 0, "ace_type", 0, MR_ACE},
-  {V_TYPEDATA, 9, 0, 0, 0, MR_ACE},
+  {V_NUM, 7},
+  {V_NUM, 8},
+  {V_LEN, 9, SUBNET_TABLE, "prefix"},
+  {V_TYPE, 10, 0, "ace_type", 0, MR_ACE},
+  {V_TYPEDATA, 11, 0, 0, 0, MR_ACE},
 };
 
 static struct validate asnt_validate =
 {
   asnt_valobj,
-  10,
+  12,
   "name",
   "name = UPPER('%s')",
   1,
@@ -1262,8 +1273,8 @@ static struct validate usnt2_validate =
 
 static char *usnt_fields[] = {
   "name",
-  "newname", "description", "status", "address", "mask", "low", "high", 
-  "prefix", "ace_type", "ace_name",
+  "newname", "description", "status", "contact", "account_number", "address", 
+  "mask", "low", "high", "prefix", "ace_type", "ace_name",
 };
 
 static struct valobj usnt_valobj[] = {
@@ -1271,19 +1282,21 @@ static struct valobj usnt_valobj[] = {
   {V_RENAME, 1, SUBNET_TABLE, "name", "snet_id", MR_NOT_UNIQUE},
   {V_LEN, 2, SUBNET_TABLE, "description"},
   {V_NUM, 3},
-  {V_NUM, 4},
-  {V_NUM, 5},
+  {V_CHAR, 4, SUBNET_TABLE, "contact"},
+  {V_CHAR, 5, SUBNET_TABLE, "account_number"},
   {V_NUM, 6},
   {V_NUM, 7},
-  {V_LEN, 8, SUBNET_TABLE, "prefix"},
-  {V_TYPE, 9, 0, "ace_type", 0, MR_ACE},
-  {V_TYPEDATA, 10, 0, 0, 0, MR_ACE},
+  {V_NUM, 8},
+  {V_NUM, 9},
+  {V_LEN, 10, SUBNET_TABLE, "prefix"},
+  {V_TYPE, 11, 0, "ace_type", 0, MR_ACE},
+  {V_TYPEDATA, 12, 0, 0, 0, MR_ACE},
 };
 
 static struct validate usnt_validate =
 {
   usnt_valobj,
-  11,
+  13,
   "name",
   "snet_id = %d",
   1,
@@ -4492,6 +4505,23 @@ struct query Queries[] = {
     &ghst_validate,
   },
 
+  {
+    /* Q_GHBA - GET_HOST_BY_ACCOUNT_NUMBER, v8 */
+    "get_host_by_account_number",
+    "ghba",
+    8,
+    RETRIEVE,
+    "m",
+    MACHINE_TABLE,
+    "m.name, m.vendor, m.model, m.os, m.location, m.contact, m.billing_contact, m.account_number, m.use, m.status, TO_CHAR(m.statuschange, 'DD-mon-YYYY HH24:MI:SS'), s.name, m.address, m.owner_type, m.owner_id, m.acomment, m.ocomment, TO_CHAR(m.created, 'DD-mon-YYYY HH24:MI:SS'), m.creator, TO_CHAR(m.inuse, 'DD-mon-YYYY HH24:MI:SS'), TO_CHAR(m.modtime, 'DD-mon-YYYY HH24:MI:SS'), m.modby, m.modwith FROM machine m, subnet s",    
+    ghba_fields,
+    23,
+    "m.account_number LIKE '%s' AND m.mach_id != 0 and s.snet_id = m.snet_id",
+    1,
+    "m.name",
+    &ghst_validate,
+  },
+
   {
     /* Q_GHHA - GET_HOST_HWADDR */
     "get_host_hwaddr",
@@ -4738,9 +4768,9 @@ struct query Queries[] = {
     RETRIEVE,
     "s",
     SUBNET_TABLE,
-    "name, description, status, saddr, mask, low, high, prefix, owner_type, owner_id, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM subnet",
+    "name, description, status, contact, account_number, saddr, mask, low, high, prefix, owner_type, owner_id, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM subnet",
     gsnt_fields,
-    13,
+    15,
     "name LIKE UPPER('%s')",
     1,
     "name",
@@ -4772,9 +4802,9 @@ struct query Queries[] = {
     APPEND,
     "s",
     SUBNET_TABLE,
-    "INTO subnet (name, description, status, saddr, mask, low, high, prefix, owner_type, owner_id, snet_id) VALUES (UPPER('%s'), NVL('%s', CHR(0)), %s, %d, %s, %s, %s, NVL('%s', CHR(0)), '%s', %d, %s)",
+    "INTO subnet (name, description, status, contact, account_number, saddr, mask, low, high, prefix, owner_type, owner_id, snet_id) VALUES (UPPER('%s'), NVL('%s', CHR(0)), %s, NVL('%s', CHR(0)), %s, %s, %s, %s, %s, NVL('%s', CHR(0)), '%s', %d, %s)",
     asnt_fields,
-    10,
+    12,
     0,
     0,
     NULL,
@@ -4806,9 +4836,9 @@ struct query Queries[] = {
     UPDATE,
     "s",
     SUBNET_TABLE,
-    "subnet SET name = UPPER('%s'), description = NVL('%s', CHR(0)), status = %s, saddr = %s, mask = %s, low = %s, high = %s, prefix = NVL('%s', CHR(0)), owner_type = '%s', owner_id = %d",
+    "subnet SET name = UPPER('%s'), description = NVL('%s', CHR(0)), status = %s, contact = NVL('%s', CHR(0)), account_number = NVL('%s', CHR(0)), saddr = %s, mask = %s, low = %s, high = %s, prefix = NVL('%s', CHR(0)), owner_type = '%s', owner_id = %d",
     usnt_fields,
-    10,
+    12,
     "snet_id = %d",
     1,
     NULL,