Index: /trunk/cgi-bin/ipdb.psql
===================================================================
--- /trunk/cgi-bin/ipdb.psql	(revision 387)
+++ /trunk/cgi-bin/ipdb.psql	(revision 388)
@@ -130,37 +130,39 @@
 --
 
-COPY "alloctypes" FROM stdin;
+COPY alloctypes ("type", listname, dispname, listorder, def_custid, arin_netname) FROM stdin;
+fc	Reserve for fibre	Fibre blocks	203	6750400	ISP
+fr	Fibre	Fibre	223		ISP
+ld	Static Pool - LAN/POP	LAN pool	195	NOC-VPN	ISP
+li	Static IP - LAN/POP	Static LAN/POP IP	190	NOC-VPN	ISP
+ai	Static IP - Managment	Static management IP	192	NOC-VPN	ISP
+ad	Static Pool - Managment	Management pool	196	NOC-VPN	ISP
+in	Internal netblock	Internal netblock	199	6750400	ISP
+pr	Dynamic-route DSL netblock (cust)	Dynamic-route DSL (cust)	221		ISPCUST
 cn	Customer netblock	Customer netblock	0		ISPCUST
-si	Static IP - Server pool	Server pool IP	20	6750400	ISP
+cd	Static Pool - Cable	Cable pool	41	CBL-BUS	ISP-STATIC-CABLE
+dp	Static Pool - DSL	DSL pool	42	DSL-BUS	ISP-STATIC-DSL
+mp	Static Pool - Dialup	Static dialup pool	43	DIAL-BUS	ISP-STATIC-DIAL
+wp	Static Pool - Wireless	Static wireless pool	44	WL-BUS	ISP-STATIC-WIFI
+me	Dialup netblock	Dialup netblock	101	DIAL-RES	ISP-DIAL
+de	Dynamic DSL block	Dynamic DSL block	102	DSL-RES	ISP-DSL
+ce	Dynamic cable block	Dynamic cable block	103	CBL-RES	ISP-CABLE
+we	Dynamic WiFi block	Dynamic WiFi block	104	WL-RES	ISP-WIFI
+pc	Reserve for dynamic-route DSL netblocks	Dynamic-route netblocks	201	6750400	ISP-STATIC-DSL
+ve	Dynamic VoIP block	Dynamic VoIP block	105	DYN-VOIP	ISP
+wc	Reserve for CORE/WAN blocks	CORE/WAN blocks	200	6750400	ISP
+wr	CORE/WAN block	CORE/WAN block	220	6750400	ISP
+sd	Static Pool - Servers	Server pool	40	6750400	ISP
+ac	Reserve for ATM	ATM blocks	202	6750400	ISP
+en	End-use netblock	End-use netblock	100	6750400	ISP
+mm	Master block	Master block	999	6750400	ISP
+ar	ATM block	ATM block	222		ISP
+rm	Routing	Routed netblock	500	6750400	ISP
+si	Static IP - Server pool	Server pool IP	20		ISP
 ci	Static IP - Cable	Static cable IP	21		ISP
 di	Static IP - DSL	Static DSL IP	22		ISP
 mi	Static IP - Dialup	Static dialup IP	23		ISP
 wi	Static IP - Wireless	Static wireless IP	24		ISP
-sd	Static Pool - Servers	Server pool	40	6750400	ISP
-cd	Static Pool - Cable	Cable pool	41	CBL-BUS	ISP-STATIC-CABLE
-dp	Static Pool - DSL	DSL pool	42	DSL-BUS	ISP-STATIC-DSL
-mp	Static Pool - Dialup	Static dialup pool	43	DIAL-BUS	ISP-STATIC-DIAL
-wp	Static Pool - Wireless	Static wireless pool	44	WL-BUS	ISP-STATIC-WIFI
-en	End-use netblock	End-use netblock	100	6750400	ISP
-me	Dialup netblock	Dialup netblock	101	DIAL-RES	ISP-DIAL
-de	Dynamic DSL block	Dynamic DSL block	102	DSL-RES	ISP-DSL
-ce	Dynamic cable block	Dynamic cable block	103	CBL-RES	ISP-CABLE
-we	Dynamic WiFi block	Dynamic WiFi block	104	WL-RES	ISP-WIFI
-ve	Dynamic VoIP block	Dynamic VoIP block	105	DYN-VOIP	ISP
-li	Static IP - LAN/POP	Static LAN/POP IP	190	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
-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
-pc	Reserve for dynamic-route DSL netblocks	Dynamic-route netblocks	201	6750400	ISP-STATIC-DSL
-ac	Reserve for ATM	ATM blocks	202	6750400	ISP
-fc	Reserve for fibre	Fibre blocks	203	6750400	ISP
-wr	CORE/WAN block	CORE/WAN block	220	6750400	ISP
-pr	Dynamic-route DSL netblock (cust)	Dynamic-route DSL (cust)	221		ISPCUST
-ar	ATM block	ATM block	222		ISP
-fr	Fibre	Fibre	223	ATM-BUS	ISP
-rm	Routing	Routed netblock	500	6750400	ISP
-mm	Master block	Master block	999	6750400	ISP
+bi	Static IP - Wifi CPE	Wifi CPE IP	193		ISP
+bd	Static pool - Wifi CPE	Wifi CPE pool	197		ISP
 \.
 
