r2832 added dictionary entries for ticket 238
authorAaron Dummer <aaron@dummer.info>
Tue, 9 Jun 2009 17:50:52 +0000 (17:50 +0000)
committerAaron Dummer <aaron@dummer.info>
Tue, 9 Jun 2009 17:50:52 +0000 (17:50 +0000)
ChangeLog
inc/config.php
install/init-dictbase.sql
install/init-dictvendors.sql
upgrade.php

index 3953a96..1ccc833 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 0.17.2
        update: show appropriate message, if a record cannot be found
+       update: add OS, router, fibre switch dictionary entries for ticket 238 (by Aaron)
        bugfix: do not produce PHP warning on LivePTR tab
 0.17.1 2009-06-03
        bugfix: tags were not displayed on "File" page
index 808e937..3327d52 100644 (file)
@@ -11,8 +11,8 @@
 
 
 // Current code version is subject to change with each new release.
-define ('CODE_VERSION', '0.17.1');
-define ('MAX_DICT_KEY', 988);
+define ('CODE_VERSION', '0.17.2');
+define ('MAX_DICT_KEY', 1054);
 
 define ('TAGNAME_REGEXP', '^[[:alnum:]]([\. _~-]?[[:alnum:]])*$');
 define ('AUTOTAGNAME_REGEXP', '^\$[[:alnum:]]([\. _~-]?[[:alnum:]])*$');
index 4e3d75b..26a30c1 100644 (file)
@@ -99,12 +99,12 @@ INSERT INTO `AttributeMap` (`objtype_id`, `attr_id`, `chapter_id`) VALUES
 (965,2,25);
 
 INSERT INTO `Chapter` (`id`, `sticky`, `name`) VALUES
+(1,'yes','RackObjectType'),
+(2,'yes','PortType'),
 (11,'no','server models'),
 (12,'no','network switch models'),
 (13,'no','server OS type'),
 (14,'no','switch OS type'),
-(1,'yes','RackObjectType'),
-(2,'yes','PortType'),
 (16,'no','router OS type'),
 (17,'no','router models'),
 (18,'no','disk array models'),
@@ -113,7 +113,8 @@ INSERT INTO `Chapter` (`id`, `sticky`, `name`) VALUES
 (22,'no','multiplexer models'),
 (23,'no','console models'),
 (24,'no','network security models'),
-(25,'no','wireless models');
+(25,'no','wireless models'),
+(26,'no','fibre channel switch models');
 
 INSERT INTO `PortCompat` (`type1`, `type2`) VALUES
 (17,17),
@@ -268,6 +269,6 @@ INSERT INTO `Config` (varname, varvalue, vartype, emptyok, is_hidden, descriptio
 ('FILTER_SUGGEST_TAGS','yes','string','no','no','Suggest tags in list filter'),
 ('FILTER_SUGGEST_PREDICATES','yes','string','no','no','Suggest predicates in list filter'),
 ('FILTER_SUGGEST_EXTRA','no','string','no','no','Suggest extra expression in list filter'),
-('DB_VERSION','0.17.1','string','no','yes','Database version.');
+('DB_VERSION','0.17.2','string','no','yes','Database version.');
 
 INSERT INTO `Script` VALUES ('RackCode','allow {$userid_1}');
index 6e7e183..73c8478 100644 (file)
@@ -938,3 +938,69 @@ INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (25,985
 INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (25,986,'Foundry%GPASS%MC3000');
 INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (25,987,'Foundry%GPASS%MC4100');
 INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (25,988,'Foundry%GPASS%MC5000');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (11,989,'Dell PowerEdge%GPASS%R410');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (11,990,'Dell PowerEdge%GPASS%R610');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (11,991,'Dell PowerEdge%GPASS%R710');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (11,992,'Dell PowerEdge%GPASS%R805');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (11,993,'Dell PowerEdge%GPASS%R905');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (11,994,'Dell PowerEdge%GPASS%M1000e');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (18,995,'Dell PowerVault MD1000');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (18,996,'Dell PowerVault MD1120');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (18,997,'Dell EqualLogic PS5000');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (18,998,'Dell EqualLogic PS6000');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (18,999,'[[EMC CLARiiON CX4-120 SPE | http://www.emc.com/products/detail/hardware/clariion-cx4-model-120.htm]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (18,1000,'[[EMC CLARiiON CX4-240 SPE | http://www.emc.com/products/detail/hardware/clariion-cx4-model-240.htm]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (18,1001,'[[EMC CLARiiON CX4-480 SPE | http://www.emc.com/products/detail/hardware/clariion-cx4-model-480.htm]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (18,1002,'[[EMC CLARiiON CX4-960 SPE | http://www.emc.com/products/detail/hardware/clariion-cx4-model-960.htm');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (18,1003,'EMC CLARiiON CX4 DAE');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1004,'[[Brocade%GPASS%300 | http://www.brocade.com/products-solutions/products/switches/product-details/300-switch/index.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1005,'[[Brocade%GPASS%4900 | http://www.brocade.com/products-solutions/products/switches/index.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1006,'[[Brocade%GPASS%5000 | http://www.brocade.com/products-solutions/products/switches/index.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1007,'[[Brocade%GPASS%5100 | http://www.brocade.com/products-solutions/products/switches/product-details/5100-switch/index.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1008,'[[Brocade%GPASS%5300 | http://www.brocade.com/products-solutions/products/switches/product-details/5300-switch/index.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1009,'[[Cisco%GPASS%MDS 9124 | http://www.cisco.com/en/US/products/ps7079/index.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1010,'[[Cisco%GPASS%MDS 9134 | http://www.cisco.com/en/US/products/ps8414/index.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1011,'[[QLogic%GPASS%1400 | http://www.qlogic.com/Products/SAN_products_FCS_san1400.aspx]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1012,'[[QLogic%GPASS%3800 | http://www.qlogic.com/Products/SAN_products_FCS_san3800.aspx]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1013,'[[QLogic%GPASS%5600Q | http://www.qlogic.com/Products/SAN_products_FCS_san5600Q.aspx]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1014,'[[QLogic%GPASS%5800V | http://www.qlogic.com/Products/SAN_products_FCS_san5802V.aspx]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (26,1015,'[[QLogic%GPASS%9000 | http://www.qlogic.com/Products/SAN_products_FCS_san9000.aspx]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (17,1016,'[[Cisco%GPASS%ASR 9006 | http://cisco.com/en/US/products/ps10075/index.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (17,1017,'[[Cisco%GPASS%ASR 9010 | http://cisco.com/en/US/products/ps10076/index.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1018,'[[Cisco%GPASS%Catalyst 4900M | http://www.cisco.com/en/US/products/ps9310/index.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1019,'[[Cisco%GPASS%Catalyst 4928-10GE | http://www.cisco.com/en/US/products/ps9903/index.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1020,'[[Cisco%GPASS%Catalyst 4948 | http://www.cisco.com/en/US/products/ps6026/index.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1021,'[[Cisco%GPASS%Catalyst 4948-10GE | http://www.cisco.com/en/US/products/ps6230/index.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1022,'[[Brocade%GPASS%FastIron CX 624S | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-cx-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1023,'[[Brocade%GPASS%FastIron CX 624S-HPOE | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-cx-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1024,'[[Brocade%GPASS%FastIron CX 648S | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-cx-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1025,'[[Brocade%GPASS%FastIron CX 648S-HPOE | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-cx-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1026,'[[Brocade%GPASS%FastIron WS 624 | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-ws-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1027,'[[Brocade%GPASS%FastIron WS 624-POE | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-ws-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1028,'[[Brocade%GPASS%FastIron WS 624G | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-ws-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1029,'[[Brocade%GPASS%FastIron WS 624G-POE | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-ws-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1030,'[[Brocade%GPASS%FastIron WS 648 | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-ws-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1031,'[[Brocade%GPASS%FastIron WS 648-POE | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-ws-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1032,'[[Brocade%GPASS%FastIron WS 648G | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-ws-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1033,'[[Brocade%GPASS%FastIron WS 648G-POE | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/fastiron-ws-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1034,'[[Brocade%GPASS%NetIron CES 2024C | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/service-provider/product-details/netiron-ces-2000-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1035,'[[Brocade%GPASS%NetIron CES 2024F | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/service-provider/product-details/netiron-ces-2000-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1036,'[[Brocade%GPASS%NetIron CES 2048C | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/service-provider/product-details/netiron-ces-2000-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1037,'[[Brocade%GPASS%NetIron CES 2048F | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/service-provider/product-details/netiron-ces-2000-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1038,'[[Brocade%GPASS%NetIron CES 2048CX | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/service-provider/product-details/netiron-ces-2000-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1039,'[[Brocade%GPASS%NetIron CES 2048FX | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/service-provider/product-details/netiron-ces-2000-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1040,'[[Brocade%GPASS%ServerIron ADX 1000 | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/application-switching/product-details/serveriron-adx-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1041,'[[Brocade%GPASS%ServerIron ADX 4000 | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/application-switching/product-details/serveriron-adx-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1042,'[[Brocade%GPASS%ServerIron ADX 8000 | http://www.brocade.com/products-solutions/products/ethernet-switches-routers/application-switching/product-details/serveriron-adx-series/overview.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1043,'[[Brocade%GPASS%ServerIron 4G-SSL-FIPS | http://www.brocade.com/sites/dotcom/products-solutions/products/ethernet-switches-routers/application-switching/product-details/serveriron-4g-application-switches/index.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (12,1044,'[[Brocade%GPASS%TurboIron 24X | http://www.brocade.com/sites/dotcom/products-solutions/products/ethernet-switches-routers/enterprise-mobility/product-details/turboiron-24x-switch/index.page]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1045,'[[Linux%GSKIP%RHF11 | http://docs.fedoraproject.org/release-notes/f11/]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1046,'[[BSD%GSKIP%NetBSD 5.0 | http://netbsd.org/releases/formal-5/NetBSD-5.0.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1047,'[[BSD%GSKIP%OpenBSD 4.5 | http://openbsd.org/45.html]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1048,'[[BSD%GSKIP%OpenSolaris 2008.05 | http://opensolaris.org/os/project/indiana/resources/relnotes/200805/x86/]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1049,'[[BSD%GSKIP%OpenSolaris 2008.11 | http://opensolaris.org/os/project/indiana/resources/relnotes/200811/x86/]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1050,'[[BSD%GSKIP%OpenSolaris 2009.06 | http://opensolaris.org/os/project/indiana/resources/relnotes/200906/x86/]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1051,'[[Linux%GSKIP%Gentoo 2006.0 | http://www.gentoo.org/proj/en/releng/release/2006.0/2006.0.xml]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1052,'[[Linux%GSKIP%Gentoo 2007.0 | http://www.gentoo.org/proj/en/releng/release/2007.0/2007.0-press-release.txt]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1053,'[[Linux%GSKIP%Gentoo 2008.0 | http://www.gentoo.org/proj/en/releng/release/2008.0/index.xml]]');
+INSERT INTO `Dictionary` (`chapter_id`, `dict_key`, `dict_value`) VALUES (13,1054,'Linux%GSKIP%Ubuntu 9.04');
index 2d1f775..14f39ea 100644 (file)
@@ -33,6 +33,7 @@ function getDBUpgradePath ($v1, $v2)
                '0.16.6',
                '0.17.0',
                '0.17.1',
+               '0.17.2',
        );
        if (!in_array ($v1, $versionhistory) or !in_array ($v2, $versionhistory))
                return NULL;
@@ -252,6 +253,35 @@ CREATE TABLE `LDAPCache` (
                        $query[] = "UPDATE Script SET script_text = NULL WHERE script_name = 'RackCodeCache'";
                        $query[] = "UPDATE Config SET varvalue = '0.17.1' WHERE varname = 'DB_VERSION'";
                        break;
+               case '0.17.2':
+                       // Many dictionary changes were made... remove all dictvendor entries and install fresh.
+                       // Take care not to erase locally added records. 0.17.1 ends with max key 988
+                       $query[] = "INSERT INTO `Chapter` (`id`, `sticky`, `name`) VALUES (26,'no','fibre channel switch models')";
+                       $query[] = 'DELETE FROM Dictionary WHERE ((chapter_id BETWEEN 11 AND 14) or (chapter_id BETWEEN 16 AND 19) ' .
+                               'or (chapter_id BETWEEN 21 AND 25)) and dict_key <= 988';
+                       $f = fopen ("install/init-dictvendors.sql", 'r');
+                       if ($f === FALSE)
+                       {
+                               showFailure ("Failed to open install/init-dictvendors.sql for reading");
+                               die;
+                       }
+                       $longq = '';
+                       while (!feof ($f))
+                       {
+                               $line = fgets ($f);
+                               if (ereg ('^--', $line))
+                                       continue;
+                               $longq .= $line;
+                       }
+                       fclose ($f);
+                       foreach (explode (";\n", $longq) as $dict_query)
+                       {
+                               if (empty ($dict_query))
+                                       continue;
+                               $query[] = $dict_query;
+                       }
+                       $query[] = "UPDATE Config SET varvalue = '0.17.2' WHERE varname = 'DB_VERSION'";
+                       break;
                default:
                        showFailure ("executeUpgradeBatch () failed, because batch '${batchid}' isn't defined", __FILE__);
                        die;