wb_upgrade: class enum changed to string

wb/exe/wb_upgrade/src/wb_upgrade.cpp

@@ -32,59 +32,58 @@
 #include <iostream>
 #include "pwr.h"
 #include "pwr_class.h"
+#include "co_cdh.h"
 #include "wb_env.h"
 #include "wb_volume.h"
 #include "wb_session.h"
 #include "wb_object.h"
 #include "pwr_baseclasses.h"
-#include "pwr_basecomponentclasses.h"
-#include "pwr_abbclasses.h"
 
 typedef struct {
-  pwr_tCid cid;
+  pwr_tOName cname;
   pwr_tObjName attr[10];
 } upg_sCnvAlarm;
 
 static upg_sCnvAlarm upg_alatext[] = {
-  {pwr_cClass_CompModeA, {"AlarmNotReadyM", "AlarmNotReadyA", "Alarm1LocalMod", "Alarm2LocalMod", "AlarmNotManOrd", "", "", "", "", ""}},
-  {pwr_cClass_CompModeAM, {"AlarmLocalMode", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_CompModeD, {"AlarmNotReadyM", "AlarmNotReadyA", "Alarm1LocalMod", "Alarm2LocalMod", "AlarmNotManOrd", "", "", "", "", ""}},
-  {pwr_cClass_CompModeD2, {"AlarmNotReadyM", "AlarmNotReadyA", "Alarm1LocalMod", "Alarm2LocalMod", "AlarmNotManOrd", "AlarmOrderTimeOut", "", "", "", ""}},
-  {pwr_cClass_CompLimit, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseSupSwitch, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseTempSwitch, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseCircuitBreaker, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseActuatorA, {"DiffAlarmText", "SwitchAlarmText", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseActuatorIncrDecr, {"SwitchAlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseContactor, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseLevelSwitch, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BasePressureSwitch, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseFilter, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseMValve, {"SwitchAlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseMDamper, {"SwitchAlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseM3WayValve, {"SwitchAlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseOverloadRelay, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseSafetySwitch, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseFcPPO5, {"AlarmTripped", "AlarmWarning", "AlarmError", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseFcPPO3, {"AlarmTripped", "AlarmWarning", "AlarmError", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseFcPPO5MotorAggr, {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseFcPPO5FanAggr, {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseFcPPO5PumpAggr, {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseFcPPO3MotorAggr, {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseFcPPO3FanAggr, {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
-  {pwr_cClass_BaseFcPPO3PumpAggr, {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
-  {pwr_cClass_ABB_CircuitBreaker_MS116, {"AlarmText", "", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_ABB_ACS800_1, {"AlarmLocalMod", "AlarmTripped", "AlarmFanOld", "AlarmWarning", "AlarmError", "", "", "", "", ""}},
-  {pwr_cClass_ABB_ACC800, {"AlarmLocalMod", "AlarmWarning", "AlarmError", "AlarmTorqFault", "AlarmBrakeFault", "AlarmTorqProvFault", "", "", "", ""}},
-  {pwr_cClass_ABB_ACS800MotorAggr, {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
-  {pwr_cClass_ABB_ACS800PumpAggr, {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
-  {pwr_cClass_ABB_ACS800FanAggr, {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
-  {pwr_cClass_ABB_Converter_ACS800_PPO3, {"AlarmTripped", "AlarmWarning", "AlarmError", "", "", "", "", "", "", ""}},
-  {pwr_cClass_ABB_Sensor_Pb_PA, {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_ABB_TempSensor_TF12, {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}},
-  {pwr_cClass_ABB_PressureSensor_265GS, {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}},
-   {pwr_cClass_ABB_DiffPressureSensor_265DS, {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}},
-   {pwr_cClass_ABB_FlowSensor_FXE4000, {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}}};
+  {"BaseComponent:Class-CompModeA", {"AlarmNotReadyM", "AlarmNotReadyA", "Alarm1LocalMod", "Alarm2LocalMod", "AlarmNotManOrd", "", "", "", "", ""}},
+  {"BaseComponent:Class-CompModeAM", {"AlarmLocalMode", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-CompModeD", {"AlarmNotReadyM", "AlarmNotReadyA", "Alarm1LocalMod", "Alarm2LocalMod", "AlarmNotManOrd", "", "", "", "", ""}},
+  {"BaseComponent:Class-CompModeD2", {"AlarmNotReadyM", "AlarmNotReadyA", "Alarm1LocalMod", "Alarm2LocalMod", "AlarmNotManOrd", "AlarmOrderTimeOut", "", "", "", ""}},
+  {"BaseComponent:Class-CompLimit", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseSupSwitch", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseTempSwitch", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseCircuitBreaker", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseActuatorA", {"DiffAlarmText", "SwitchAlarmText", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseActuatorIncrDecr", {"SwitchAlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseContactor", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseLevelSwitch", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BasePressureSwitch", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseFilter", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseMValve", {"SwitchAlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseMDamper", {"SwitchAlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseM3WayValve", {"SwitchAlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseOverloadRelay", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseSafetySwitch", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseFcPPO5", {"AlarmTripped", "AlarmWarning", "AlarmError", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseFcPPO3", {"AlarmTripped", "AlarmWarning", "AlarmError", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseFcPPO5MotorAggr", {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseFcPPO5FanAggr", {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseFcPPO5PumpAggr", {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseFcPPO3MotorAggr", {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseFcPPO3FanAggr", {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
+  {"BaseComponent:Class-BaseFcPPO3PumpAggr", {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
+  {"ABB:Class-ABB_CircuitBreaker_MS116", {"AlarmText", "", "", "", "", "", "", "", "", ""}},
+  {"ABB:Class-ABB_ACS800_1", {"AlarmLocalMod", "AlarmTripped", "AlarmFanOld", "AlarmWarning", "AlarmError", "", "", "", "", ""}},
+  {"ABB:Class-ABB_ACC800", {"AlarmLocalMod", "AlarmWarning", "AlarmError", "AlarmTorqFault", "AlarmBrakeFault", "AlarmTorqProvFault", "", "", "", ""}},
+  {"ABB:Class-ABB_ACS800MotorAggr", {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
+  {"ABB:Class-ABB_ACS800PumpAggr", {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
+  {"ABB:Class-ABB_ACS800FanAggr", {"AlarmTextToOften", "AlarmTextPowOnNotOk", "AlarmTextStartNoOk", "", "", "", "", "", "", ""}},
+  {"ABB:Class-ABB_Converter_ACS800_PPO3", {"AlarmTripped", "AlarmWarning", "AlarmError", "", "", "", "", "", "", ""}},
+  {"ABB:Class-ABB_Sensor_Pb_PA", {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}},
+  {"ABB:Class-ABB_TempSensor_TF12", {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}},
+  {"ABB:Class-ABB_PressureSensor_265GS", {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}},
+   {"ABB:Class-ABB_DiffPressureSensor_265DS", {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}},
+   {"ABB:Class-ABB_FlowSensor_FXE4000", {"AlarmTextTransmError", "AlarmTextTransmWarning", "", "", "", "", "", "", "", ""}}};
 
 
 
@@ -184,11 +183,20 @@ int main( int argc, char *argv[])
   // Replace alarmtexts with tailing ", "
   pwr_tAttrRef aref;
   pwr_tString80 text;
+  pwr_tCid cid;
   
   for ( unsigned int i = 0; i < sizeof(upg_alatext)/sizeof(upg_alatext[0]); i++) {
-    for ( session.aref( upg_alatext[i].cid, &aref);
+    wb_object co = session.object( upg_alatext[i].cname);
+    if ( !co) {
+      printf( "** Class not loaded: %s\n", upg_alatext[i].cname);
+      continue;
+    }
+    
+    cid = cdh_ClassObjidToId( co.oid());
+
+    for ( session.aref( cid, &aref);
 	  session.oddSts();
-	  session.nextAref( upg_alatext[i].cid, &aref, &aref)) {
+	  session.nextAref( cid, &aref, &aref)) {
 
       for ( unsigned int j = 0; j < sizeof(upg_alatext[0].attr)/sizeof(upg_alatext[0].attr[0]); j++) {
 	if ( strcmp( upg_alatext[i].attr[j], "") == 0)