Skip to content

P
proview
Commit aa8f94ed authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Wb configure, change of default node hierarchy, and BuidConfig added in directory volume

parent 343253b0
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 37 deletions
wb/exp/com/src/wb_wiz_directoryvolume.pwr_com 100755 → 100644
View file @ aa8f94ed
...@@ -622,6 +622,23 @@ page_4: ...@@ -622,6 +622,23 @@ page_4:
endfor endfor
endfor endfor
# Create BuildConfig objects
create object /dest=""/class=BuildConfig /name="Build" /last
create object /dest="Build"/class=BuildDirectory /name="pop" /first
name = "Build-pop";
attr = name + ".Directory";
SetAttribute( attr, "$pwrp_pop");
attr = name + ".Options";
SetAttribute( attr, 1);
create object /dest="Build-pop"/class=BuildCopy /name="pwg" /first
name = "Build-pop-pwg";
attr = name + ".Source";
SetAttribute( attr, "*.pwg");
attr = name + ".Target";
SetAttribute( attr, "$pwrp_exe/,$pwrp_web/");
save/quiet save/quiet
noedit noedit
......
wb/exp/com/src/wb_wiz_rootvolume.pwr_com 100755 → 100644
View file @ aa8f94ed
...@@ -48,6 +48,10 @@ main() ...@@ -48,6 +48,10 @@ main()
extern int rv_standard = 1; extern int rv_standard = 1;
extern int rv_customized = 0; extern int rv_customized = 0;
extern string rv_nodehierroot; extern string rv_nodehierroot;
extern string rv_nodehier_opplaces;
extern string rv_nodehier_servers;
extern string rv_nodehier_io;
extern string rv_nodehier_applications;
extern string rv_nodename; extern string rv_nodename;
extern string rv_opop; extern string rv_opop;
extern string rv_opmaintenance; extern string rv_opmaintenance;
...@@ -68,6 +72,7 @@ main() ...@@ -68,6 +72,7 @@ main()
string volume; string volume;
string str1; string str1;
string nname; string nname;
string sname;
string oname; string oname;
string current_node; string current_node;
string hw; string hw;
...@@ -76,6 +81,10 @@ main() ...@@ -76,6 +81,10 @@ main()
verify(0); verify(0);
rv_nodehierroot = get_pwr_config( "defaultNodeHierRoot"); rv_nodehierroot = get_pwr_config( "defaultNodeHierRoot");
rv_nodehier_opplaces = get_pwr_config( "defaultOpPlaces");
rv_nodehier_servers = get_pwr_config( "defaultServers");
rv_nodehier_io = get_pwr_config( "defaultIO");
rv_nodehier_applications = get_pwr_config( "defaultApplications");
rv_opop = get_pwr_config( "defaultOpOp"); rv_opop = get_pwr_config( "defaultOpOp");
rv_opmaintenance = get_pwr_config( "defaultOpMaintenance"); rv_opmaintenance = get_pwr_config( "defaultOpMaintenance");
...@@ -184,24 +193,15 @@ page_4: ...@@ -184,24 +193,15 @@ page_4:
nname = rv_nodename; nname = rv_nodename;
endif endif
if ( rv_opop != "")
oname = nname + "-" + "Op";
move object/rename="'rv_opop'"/source='oname'
endif
if ( rv_opmaintenance != "")
oname = nname + "-" + "Maintenance";
move object/rename="'rv_opmaintenance'"/source='oname'
endif
# Create (or delete) server objects # Create (or delete) server objects
sname = nname + "-" + rv_nodehier_servers;
if ( !rv_server_backup) if ( !rv_server_backup)
oname = nname + "-" + "Backup"; oname = sname + "-" + "Backup";
delete object/name='oname'/noconf/nolog delete object/name='oname'/noconf/nolog
endif endif
if ( !rv_server_statusserver) if ( !rv_server_statusserver)
oname = nname + "-" + "StatusServer"; oname = sname + "-" + "StatusServer";
delete object/name='oname'/noconf/nolog delete object/name='oname'/noconf/nolog
endif endif
...@@ -211,23 +211,23 @@ page_4: ...@@ -211,23 +211,23 @@ page_4:
endif endif
if ( rv_server_nodelinksup) if ( rv_server_nodelinksup)
create object/dest='nname'/name="NodeLinkSup"/last/class=NodeLinkSup create object/dest='sname'/name="NodeLinkSup"/last/class=NodeLinkSup
endif endif
if ( rv_server_fast) if ( rv_server_fast)
create object/dest='nname'/name="DsFastConf"/last/class=DsFastConf create object/dest='sname'/name="DsFastConf"/last/class=DsFastConf
endif endif
if ( rv_server_trend) if ( rv_server_trend)
create object/dest='nname'/name="DsTrendConf"/last/class=DsTrendConf create object/dest='sname'/name="DsTrendConf"/last/class=DsTrendConf
endif endif
if ( rv_server_sysmon) if ( rv_server_sysmon)
create object/dest='nname'/name="SysMon"/last/class=SysMonConfig create object/dest='sname'/name="SysMon"/last/class=SysMonConfig
endif endif
if ( rv_server_histmon) if ( rv_server_histmon)
create object/dest='nname'/name="SevHistMonitor"/last/class=SevHistMonitor create object/dest='sname'/name="SevHistMonitor"/last/class=SevHistMonitor
oname = nname + "-SevHistMonitor"; oname = sname + "-SevHistMonitor";
create object/dest='oname'/name="1s"/last/class=SevHistThread create object/dest='oname'/name="1s"/last/class=SevHistThread
oname = nname + "-SevHistMonitor-1s"; oname = sname + "-SevHistMonitor-1s";
set attr/name='oname'/attr=ScanTime/value=1/nolog/noconf set attr/name='oname'/attr=ScanTime/value=1/nolog/noconf
if ( rv_server_sevserver) if ( rv_server_sevserver)
str1 = tolower( rv_nodename); str1 = tolower( rv_nodename);
...@@ -235,28 +235,26 @@ page_4: ...@@ -235,28 +235,26 @@ page_4:
endif endif
endif endif
if ( rv_server_sevserver) if ( rv_server_sevserver)
create object/dest='nname'/name="SevServer"/last/class=SevServer create object/dest='sname'/name="SevServer"/last/class=SevServer
endif endif
if ( rv_server_opcserver) if ( rv_server_opcserver)
create object/dest='nname'/name="OpcServer"/last/class=Opc_ServerConfig create object/dest='sname'/name="OpcServer"/last/class=Opc_ServerConfig
endif endif
if ( rv_server_remh) if ( rv_server_remh)
create object/dest='nname'/name="Remote"/last/class=RemoteConfig create object/dest='sname'/name="Remote"/last/class=RemoteConfig
endif endif
if ( rv_server_remlogg) if ( rv_server_remlogg)
create object/dest='nname'/name="Logg"/last/class=LoggConfig create object/dest='sname'/name="Logg"/last/class=LoggConfig
endif endif
if ( rv_server_elog) if ( rv_server_elog)
oname = nname + "-" + "MessageHandler"; oname = sname + "-" + "MessageHandler";
set attr/name='oname'/attr=EventLogSize/value=10000/noconf/nolog set attr/name='oname'/attr=EventLogSize/value=10000/noconf/nolog
endif endif
if ( rv_opstation) if ( rv_opstation)
# Create a dummy plc # Remove IO Hierarchy
#create object/dest=""/name="Op"/after/class=$PlantHier oname = nname + "-" + rv_nodehier_io;
#create object/dest=Op/name="Dummy"/first/class=PlcPgm delete object /name='oname'/noconf /nolog
#create object/dest=Op-Dummy/name="W"/first/class=WindowPlc
#set attr/name=Op-Dummy-W/attr=Modified/value="01-JUL-2008 01:00:00"/nolog/noconf
endif endif
save/quiet save/quiet
...@@ -277,6 +275,10 @@ exit_now: ...@@ -277,6 +275,10 @@ exit_now:
delete rv_customized; delete rv_customized;
delete rv_nodehierroot; delete rv_nodehierroot;
delete rv_nodename; delete rv_nodename;
delete rv_nodehier_opplaces;
delete rv_nodehier_servers;
delete rv_nodehier_io;
delete rv_nodehier_applications;
delete rv_opop; delete rv_opop;
delete rv_opmaintenance; delete rv_opmaintenance;
delete pwr_wizard_title; delete pwr_wizard_title;
......
wb/lib/wb/src/wb_c_node.cpp
View file @ aa8f94ed
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
/* wb_c_node.c -- work bench methods of the Node class. */ /* wb_c_node.c -- work bench methods of the Node class. */
#include "co_cnf.h"
#include "wb_pwrs.h" #include "wb_pwrs.h"
#include "wb_pwrs_msg.h" #include "wb_pwrs_msg.h"
#include "wb_ldh.h" #include "wb_ldh.h"
...@@ -53,22 +54,40 @@ static pwr_tStatus PostCreate ( ...@@ -53,22 +54,40 @@ static pwr_tStatus PostCreate (
pwr_tObjid oid; pwr_tObjid oid;
pwr_tClassId cid; pwr_tClassId cid;
pwr_tStatus sts; pwr_tStatus sts;
pwr_tObjName name;
pwr_tOid srv_oid, opp_oid;
sts = ldh_CreateObject(Session, &oid, "Security", pwr_eClass_Security, Object, ldh_eDest_IntoLast); sts = ldh_CreateObject(Session, &oid, "Security", pwr_eClass_Security, Object, ldh_eDest_IntoLast);
// Server objects
cnf_get_value( "defaultServers", name, sizeof(name));
sts = ldh_ClassNameToId(Session, &cid, "$NodeHier");
sts = ldh_CreateObject(Session, &srv_oid, name, cid, Object, ldh_eDest_IntoLast);
sts = ldh_ClassNameToId(Session, &cid, "MessageHandler"); sts = ldh_ClassNameToId(Session, &cid, "MessageHandler");
sts = ldh_CreateObject(Session, &oid, "MessageHandler", cid, Object, ldh_eDest_IntoLast); sts = ldh_CreateObject(Session, &oid, "MessageHandler", cid, srv_oid, ldh_eDest_IntoLast);
sts = ldh_ClassNameToId(Session, &cid, "IOHandler"); sts = ldh_ClassNameToId(Session, &cid, "IOHandler");
sts = ldh_CreateObject(Session, &oid, "IOHandler", cid, Object, ldh_eDest_IntoLast); sts = ldh_CreateObject(Session, &oid, "IOHandler", cid, srv_oid, ldh_eDest_IntoLast);
sts = ldh_ClassNameToId(Session, &cid, "Backup_Conf"); sts = ldh_ClassNameToId(Session, &cid, "Backup_Conf");
sts = ldh_CreateObject(Session, &oid, "Backup", cid, Object, ldh_eDest_IntoLast); sts = ldh_CreateObject(Session, &oid, "Backup", cid, srv_oid, ldh_eDest_IntoLast);
sts = ldh_ClassNameToId(Session, &cid, "StatusServerConfig");
sts = ldh_CreateObject(Session, &oid, "StatusServer", cid, srv_oid, ldh_eDest_IntoLast);
// OpPlace objects
cnf_get_value( "defaultOpPlaces", name, sizeof(name));
sts = ldh_ClassNameToId(Session, &cid, "$NodeHier");
sts = ldh_CreateObject(Session, &opp_oid, name, cid, Object, ldh_eDest_IntoLast);
sts = ldh_ClassNameToId(Session, &cid, "OpPlace"); sts = ldh_ClassNameToId(Session, &cid, "OpPlace");
sts = ldh_CreateObject(Session, &oid, "Op", cid, Object, ldh_eDest_IntoLast); cnf_get_value( "defaultOpOp", name, sizeof(name));
sts = ldh_CreateObject(Session, &oid, "Maintenance", cid, Object, ldh_eDest_IntoLast); sts = ldh_CreateObject(Session, &oid, name, cid, opp_oid, ldh_eDest_IntoLast);
sts = ldh_CreateObject(Session, &oid, "OpDefault", cid, Object, ldh_eDest_IntoLast); cnf_get_value( "defaultOpMaintenance", name, sizeof(name));
sts = ldh_CreateObject(Session, &oid, name, cid, opp_oid, ldh_eDest_IntoLast);
cnf_get_value( "defaultOpDefault", name, sizeof(name));
sts = ldh_CreateObject(Session, &oid, name, cid, opp_oid, ldh_eDest_IntoLast);
sts = ldh_ClassNameToId(Session, &cid, "PlcProcess"); sts = ldh_ClassNameToId(Session, &cid, "PlcProcess");
sts = ldh_CreateObject(Session, &oid, "Plc", cid, Object, ldh_eDest_IntoLast); sts = ldh_CreateObject(Session, &oid, "Plc", cid, Object, ldh_eDest_IntoLast);
...@@ -79,8 +98,10 @@ static pwr_tStatus PostCreate ( ...@@ -79,8 +98,10 @@ static pwr_tStatus PostCreate (
sts = ldh_ClassNameToId(Session, &cid, "WebBrowserConfig"); sts = ldh_ClassNameToId(Session, &cid, "WebBrowserConfig");
sts = ldh_CreateObject(Session, &oid, "WebBrowser", cid, Object, ldh_eDest_IntoLast); sts = ldh_CreateObject(Session, &oid, "WebBrowser", cid, Object, ldh_eDest_IntoLast);
sts = ldh_ClassNameToId(Session, &cid, "StatusServerConfig"); // IO
sts = ldh_CreateObject(Session, &oid, "StatusServer", cid, Object, ldh_eDest_IntoLast); cnf_get_value( "defaultIO", name, sizeof(name));
sts = ldh_ClassNameToId(Session, &cid, "$NodeHier");
sts = ldh_CreateObject(Session, &oid, name, cid, Object, ldh_eDest_IntoLast);
return PWRS__SUCCESS; return PWRS__SUCCESS;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7