Changeset 286 for branches/stable/cgi-bin/ipdb.psql

Timestamp:

09/23/05 15:54:31 (19 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge changes from /trunk revisions:

234
237
254 (ipdb.css only)
261
279
284
285

This merges the new search system (234, 237, 254), cleans up
some display CSS (254, 279), cleans up some leftover code (r261),
and merges the "private data" code (284, 285 - note SWIP hacks conflict).

/trunk should now be almost identical to /branches/stable.

File:

• branches/stable/cgi-bin/ipdb.psql (modified) (3 diffs)

branches/stable/cgi-bin/ipdb.psql

@@ -69 +69 @@
         "description" character varying(64) DEFAULT '' NOT NULL,
         "circuitid" character varying(128) DEFAULT '' NOT NULL,
+        "privdata" text DEFAULT '' NOT NULL,
         "newcustid" integer,
         CHECK (((available = 'y'::bpchar) OR (available = 'n'::bpchar)))
@@ -86 +87 @@
         "maskbits" integer DEFAULT 128,
         "circuitid" character varying(128) DEFAULT '',
+        "privdata" text DEFAULT '' NOT NULL,
         "newcustid" integer
 );
@@ -93 +95 @@
 GRANT ALL on "allocations" to "ipdb";
 
-CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description FROM poolips;
+CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes FROM poolips;
 
 REVOKE ALL on "searchme" from PUBLIC;