Changeset 371 for trunk/cgi-bin/ipdb.psql

Timestamp:

11/27/07 12:27:45 (16 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge bugfixes and enhancements from /branches/stable r360 through r369

File:

• trunk/cgi-bin/ipdb.psql (modified) (4 diffs)

trunk/cgi-bin/ipdb.psql

@@ -38 +38 @@
         "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY,
         "ctime" timestamp DEFAULT now(),
-        "mtime" timestamp DEFAULT now()
+        "mtime" timestamp DEFAULT now(),
+        "rwhois" character(1) DEFAULT 'n' NOT NULL
 );
 
@@ -111 +112 @@
 GRANT ALL on "allocations" to "ipdb";
 
-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;
+CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.oldcustid, allocations.circuitid FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.oldcustid, poolips.circuitid FROM poolips;
 
 REVOKE ALL on "searchme" from PUBLIC;
@@ -148 +149 @@
 ve      Dynamic VoIP block      Dynamic VoIP block      105     DYN-VOIP        ISP
 li      Static IP - LAN/POP     Static LAN/POP IP       190     NOC-VPN ISP
-li      Static IP - Management  Static management IP    191     NOC-VPN ISP
+ai      Static IP - Management  Static management IP    191     NOC-VPN ISP
 ld      Static Pool - LAN/POP   LAN pool        195     NOC-VPN ISP
-ld      Static Pool - Management        Management pool 196     NOC-VPN ISP
+ad      Static Pool - Management        Management pool 196     NOC-VPN ISP
 in      Internal netblock       Internal netblock       199     6750400 ISP
 wc      Reserve for CORE/WAN blocks     CORE/WAN blocks 200     6750400 ISP
@@ -159 +160 @@
 pr      Dynamic-route DSL netblock      Dynamic-route DSL       221             ISP
 ar      ATM block       ATM block       222             ISP
-fr      Fibre   Fibre   223             ISP
+fr      Fibre   Fibre   223     ATM-BUS ISP
 rm      Routing Routed netblock 500     6750400 ISP
 mm      Master block    Master block    999     6750400 ISP