Skip to content

P
proview
Commit 9b56a2ac authored by claes's avatar claes
Browse files
Options

*** empty log message ***

parent 5eccd5f1
Hide whitespace changes
Inline Side-by-side
Showing with 423 additions and 647 deletions
nmps/wbl/nmps/src/nmps_c_nmpscell.wb_load
View file @ 9b56a2ac
...@@ -124,6 +124,9 @@ SObject NMps:Class ...@@ -124,6 +124,9 @@ SObject NMps:Class
! !
! 8 When the cell is reseted by the ResetObject, the dataobject is also ! 8 When the cell is reseted by the ResetObject, the dataobject is also
! removed from the database rtdb. ! removed from the database rtdb.
!
! 16 Backup. The cell and data objects in the cell, is backed up by
! the nmps backup process.
!*/ !*/
Object Function $Intern 4 Object Function $Intern 4
Body SysBody Body SysBody
......
nmps/wbl/nmps/src/nmps_c_nmpsstorecell.wb_load
View file @ 9b56a2ac
...@@ -116,6 +116,9 @@ SObject NMps:Class ...@@ -116,6 +116,9 @@ SObject NMps:Class
! !
! 8 When the cell is reseted by the ResetObject, the dataobject is also ! 8 When the cell is reseted by the ResetObject, the dataobject is also
! removed from the database rtdb. ! removed from the database rtdb.
!
! 16 Backup. The cell and data objects in the cell, is backed up by
! the nmps backup process.
!*/ !*/
Object Function $Intern 4 Object Function $Intern 4
Body SysBody Body SysBody
......
src/doc/orm/src/os_linux/hw_x86/makefile
View file @ 9b56a2ac
...@@ -38,6 +38,7 @@ clean_gif := $(patsubst %.gif,clean_%.gif,$(gif_sources)) ...@@ -38,6 +38,7 @@ clean_gif := $(patsubst %.gif,clean_%.gif,$(gif_sources))
$(doc_dir)/orm/%.gif : %.gif $(doc_dir)/orm/%.gif : %.gif
@ $(log_h_h) @ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target) @ $(cp) $(cpflags) $(source) $(target)
@ $(cp) $(cpflags) $(source) $(doc_dir)/help
.PHONY : all init copy lib exe clean realclean \ .PHONY : all init copy lib exe clean realclean \
$(clean_gif) $(clean_gif)
......
src/doc/prm/src/doxygen.dx
View file @ 9b56a2ac
...@@ -27,6 +27,16 @@ ...@@ -27,6 +27,16 @@
This module contains routines for the Queue Communication. This module contains routines for the Queue Communication.
*/ */
/*! \defgroup Time Time functions
\ingroup PRM
This module contains utilites for time management.
*/
......
src/doc/prm/src/os_linux/hw_x86/Doxyfile
View file @ 9b56a2ac
...@@ -5,9 +5,11 @@ HIDE_UNDOC_MEMBERS = YES ...@@ -5,9 +5,11 @@ HIDE_UNDOC_MEMBERS = YES
HIDE_UNDOC_CLASSES = YES HIDE_UNDOC_CLASSES = YES
SOURCE_BROWSER = YES SOURCE_BROWSER = YES
INPUT = $(pwre_sroot)/doc/prm/src/doxygen.dx \ INPUT = $(pwre_sroot)/doc/prm/src/doxygen.dx \
$(pwre_sroot)/lib/co/src/co_time.h \
$(pwre_sroot)/lib/rt/src/rt_gdh.h \ $(pwre_sroot)/lib/rt/src/rt_gdh.h \
$(pwre_sroot)/lib/rt/src/rt_mh_appl.h \ $(pwre_sroot)/lib/rt/src/rt_mh_appl.h \
$(pwre_sroot)/lib/rt/src/rt_qcom.h \ $(pwre_sroot)/lib/rt/src/rt_qcom.h \
$(pwre_sroot)/lib/co/src/co_time.c \
$(pwre_sroot)/lib/rt/src/rt_gdh.c \ $(pwre_sroot)/lib/rt/src/rt_gdh.c \
$(pwre_sroot)/lib/rt/src/rt_mh_appl.c \ $(pwre_sroot)/lib/rt/src/rt_mh_appl.c \
$(pwre_sroot)/lib/rt/src/rt_qcom.c $(pwre_sroot)/lib/rt/src/rt_qcom.c
......
src/doc/web/src/main_menu.html
View file @ 9b56a2ac
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<tr><td><a href="dguide.pdf" target="right">Designer's Guide</a></td></tr> <tr><td><a href="dguide.pdf" target="right">Designer's Guide</a></td></tr>
<tr><td><a href="prm_f.html" target="_top">Programmer's Referens Manual</a></td></tr> <tr><td><a href="prm_f.html" target="_top">Programmer's Referens Manual</a></td></tr>
<tr><td><a href="qcom.pdf" target="right">QCOM Reference Guide</a></td></tr> <tr><td><a href="qcom.pdf" target="right">QCOM Reference Guide</a></td></tr>
<tr><td><a href="help_f.html" target="right">Help</a></td></tr>
</table> </table>
<br> <br>
...@@ -22,6 +23,7 @@ ...@@ -22,6 +23,7 @@
<hr> <hr>
<table id="mainmenu" border="1" cellspacing="0" width="100%"> <table id="mainmenu" border="1" cellspacing="0" width="100%">
<tr><td><a href="download_f.html" target="right">Download</a></td></tr>
<tr><td><a href="dev_index.html" target="_top">Developer's Site</a></td></tr> <tr><td><a href="dev_index.html" target="_top">Developer's Site</a></td></tr>
</table> </table>
<br> <br>
......
src/doc/web/src/orm.html
View file @ 9b56a2ac
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<br> <br>
<hr>
<a href="orm_intro.html" target="_self"><font size=4>Introduction</font></a>
<!-- ******* SystemClasses **********--> <!-- ******* SystemClasses **********-->
<hr> <hr>
<table id="mainmenu" border="1" cellspacing="0" width="100%"> <table id="mainmenu" border="1" cellspacing="0" width="100%">
......
src/doc/web/src/orm_f.html
View file @ 9b56a2ac
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<frameset rows="90,*" frameborder="0"> <frameset rows="90,*" frameborder="0">
<frame name="I1" frameborder="0" noresize scrolling="no" src="orm_h.html"></frame> <frame name="I1" frameborder="0" noresize scrolling="no" src="orm_h.html"></frame>
<frame name="I2" frameborder="0" noresize scrolling="no" src="orm.html"></frame> <frame name="I2" frameborder="0" src="orm.html"></frame>
</frameset> </frameset>
</html> </html>
\ No newline at end of file
src/doc/web/sv_se/main_menu.html
View file @ 9b56a2ac
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<body id="mainmenu"> <body id="mainmenu">
<h2 id="mainmenu">Dokumentation</h2><br> <h2 id="mainmenu">Dokumentation</h2><br>
<table id="mainmenu" border="1" cellspacing="0" width="100%"> <table id="mainmenu" border="1" cellspacing="0" width="100%">
<tr><td><a href="../orm_f.html" target="_top">Objekt Handbok</a></td></tr> <tr><td><a href="../orm_f.html" target="_top">Objekt Handbok</a> <a href="pwrb_xtthelp_f.html" target="right">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[svenska]</a></td></tr>
<tr><td><a href="../dguide.pdf" target="right">Designer's Guide</a></td></tr> <tr><td><a href="../dguide.pdf" target="right">Designer's Guide</a></td></tr>
<tr><td><a href="../prm_f.html" target="_top">Programmer's Referens Manual</a></td></tr> <tr><td><a href="../prm_f.html" target="_top">Programmer's Referens Manual</a></td></tr>
<tr><td><a href="dd_ge.pdf" target="right">Ge</a></td></tr> <tr><td><a href="dd_ge.pdf" target="right">Ge</a></td></tr>
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<tr><td><a href="remote.pdf" target="right">Remote</a></td></tr> <tr><td><a href="remote.pdf" target="right">Remote</a></td></tr>
<tr><td><a href="profibus.pdf" target="right">Profibus</a></td></tr> <tr><td><a href="profibus.pdf" target="right">Profibus</a></td></tr>
<tr><td><a href="rd_ssabobjects.pdf" target="right">SSAB I/O</a></td></tr> <tr><td><a href="rd_ssabobjects.pdf" target="right">SSAB I/O</a></td></tr>
<tr><td><a href="../help_f.html" target="right">Hjlp</a></td></tr>
</table> </table>
<br> <br>
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
<a href="mailto:postmaster@proview.se">skicka meddelande</a> <a href="mailto:postmaster@proview.se">skicka meddelande</a>
<hr> <hr>
<table id="mainmenu" border="1" cellspacing="0" width="100%"> <table id="mainmenu" border="1" cellspacing="0" width="100%">
<tr><td><a href="../download_f.html" target="right">Download</a></td></tr>
<tr><td><a href="../dev_index.html" target="_top">Developer's Site</a></td></tr> <tr><td><a href="../dev_index.html" target="_top">Developer's Site</a></td></tr>
</table> </table>
<br> <br>
......
src/exe/co_convert/src/cnv_help.cpp
View file @ 9b56a2ac
...@@ -92,7 +92,7 @@ void *wnav_help_insert_cb( void *ctx, navh_eItemType item_type, char *text1, ...@@ -92,7 +92,7 @@ void *wnav_help_insert_cb( void *ctx, navh_eItemType item_type, char *text1,
else { else {
if ( in_table) { if ( in_table) {
// Close table (keep if empty line) // Close table (keep if empty line)
if ( !( strcmp( text1, "") == 0 && if ( !( text1 && strcmp( text1, "") == 0 &&
(item_type == navh_eItemType_Help || (item_type == navh_eItemType_Help ||
item_type == navh_eItemType_HelpBold))) { item_type == navh_eItemType_HelpBold))) {
xh->fp << "</TABLE>" << endl; xh->fp << "</TABLE>" << endl;
......
src/exe/rt_ini/src/ini.c
View file @ 9b56a2ac
...@@ -282,7 +282,7 @@ readSectVolRef ( ...@@ -282,7 +282,7 @@ readSectVolRef (
pwr_dStatus(sts, status, INI__SUCCESS); pwr_dStatus(sts, status, INI__SUCCESS);
#if 0 #if 1
if (fseek(cp->dbs.f, cp->sect.offset, SEEK_SET) != 0) if (fseek(cp->dbs.f, cp->sect.offset, SEEK_SET) != 0)
pwr_Return(NO, sts, errno_GetStatus()); pwr_Return(NO, sts, errno_GetStatus());
...@@ -1028,20 +1028,26 @@ ini_ReadBootFile ( ...@@ -1028,20 +1028,26 @@ ini_ReadBootFile (
cp->group[0] = '\0'; cp->group[0] = '\0';
n = sscanf(s, "%s", cp->group); n = sscanf(s, "%s", cp->group);
break; break;
case 3: /* Find PLC version. */ case 3: { /* Find PLC version. */
char *t;
i++; i++;
#if 1 n = sscanf(s, "%s %s", vname, vids);
n = sscanf(s, "%s %s %d", vname, vids, &cp->node.plcVersion); if (n < 2) {
#else errh_LogError(&cp->log, "Bootfile corrupt, error in plc data");
n = sscanf(s, "%s %d", vids, &cp->node.plcVersion); cp->errors++;
#endif continue;
}
if (n < 3) { t = strrchr( vname, '_');
errh_LogError(&cp->log, "Found no PLC version"); n = sscanf(t+1, "%d", &cp->node.plcVersion);
if (n < 1) {
errh_LogError(&cp->log, "Bootfile corrupt, error in plc data");
cp->errors++; cp->errors++;
continue; continue;
} }
if (!cp->flags.b.plcfile) { if (!cp->flags.b.plcfile) {
#if defined OS_LYNX || defined OS_LINUX #if defined OS_LYNX || defined OS_LINUX
sprintf(cp->plcfile.name, dbs_cNamePlc, "", cp->nodename, cp->busid, cp->node.plcVersion); sprintf(cp->plcfile.name, dbs_cNamePlc, "", cp->nodename, cp->busid, cp->node.plcVersion);
...@@ -1066,6 +1072,7 @@ ini_ReadBootFile ( ...@@ -1066,6 +1072,7 @@ ini_ReadBootFile (
cdh_ToLower(cp->plcfile.name, cp->plcfile.name); cdh_ToLower(cp->plcfile.name, cp->plcfile.name);
errh_LogInfo(&cp->log, "This node vill run PLC file: %s", cp->plcfile.name); errh_LogInfo(&cp->log, "This node vill run PLC file: %s", cp->plcfile.name);
break; break;
}
case 4: /* Find root volume. */ case 4: /* Find root volume. */
i++; i++;
n = sscanf(s, "%s %s", vname, vids); n = sscanf(s, "%s %s", vname, vids);
......
src/exe/rt_tmon/src/rt_tmon.c
View file @ 9b56a2ac
...@@ -245,7 +245,11 @@ sancAdd ( ...@@ -245,7 +245,11 @@ sancAdd (
pool_sQlink *nl; pool_sQlink *nl;
if (first) { if (first) {
#ifdef OS_LINUX
cycle = 1 * sysconf(_SC_CLK_TCK);
#else
cycle = 1 * CLK_TCK; cycle = 1 * CLK_TCK;
#endif
setInterval(&cycle, gdbroot->db->sanc_add_int); setInterval(&cycle, gdbroot->db->sanc_add_int);
first = 0; first = 0;
} }
...@@ -286,7 +290,11 @@ sancExpired ( ...@@ -286,7 +290,11 @@ sancExpired (
pool_sQlink *nl; pool_sQlink *nl;
if (first) { if (first) {
#ifdef OS_LINUX
cycle = 60 * sysconf(_SC_CLK_TCK);
#else
cycle = 60 * CLK_TCK; cycle = 60 * CLK_TCK;
#endif
setInterval(&cycle, gdbroot->db->sanc_exp_int); setInterval(&cycle, gdbroot->db->sanc_exp_int);
first = 0; first = 0;
} }
...@@ -328,7 +336,11 @@ sansCheck ( ...@@ -328,7 +336,11 @@ sansCheck (
pool_sQlink *nl; pool_sQlink *nl;
if (first) { if (first) {
#ifdef OS_LINUX
cycle = 2 * sysconf(_SC_CLK_TCK);
#else
cycle = 2 * CLK_TCK; cycle = 2 * CLK_TCK;
#endif
setInterval(&cycle, gdbroot->db->sans_chk_int); setInterval(&cycle, gdbroot->db->sans_chk_int);
first = 0; first = 0;
} }
...@@ -370,7 +382,11 @@ subcCheck ( ...@@ -370,7 +382,11 @@ subcCheck (
static pwr_tBoolean first = 1; static pwr_tBoolean first = 1;
if (first) { if (first) {
#ifdef OS_LINUX
cycle = 3 * sysconf(_SC_CLK_TCK);
#else
cycle = 3 * CLK_TCK; cycle = 3 * CLK_TCK;
#endif
setInterval(&cycle, gdbroot->db->subc_chk_int); setInterval(&cycle, gdbroot->db->subc_chk_int);
first = 0; first = 0;
} }
...@@ -426,7 +442,11 @@ cacheTrim ( ...@@ -426,7 +442,11 @@ cacheTrim (
static pwr_tBoolean first = 1; static pwr_tBoolean first = 1;
if (first) { if (first) {
#ifdef OS_LINUX
cycle = 1 * sysconf(_SC_CLK_TCK);
#else
cycle = 1 * CLK_TCK; cycle = 1 * CLK_TCK;
#endif
setInterval(&cycle, gdbroot->db->cache_trim_int); setInterval(&cycle, gdbroot->db->cache_trim_int);
first = 0; first = 0;
} }
...@@ -554,7 +574,12 @@ msToClock ( ...@@ -554,7 +574,12 @@ msToClock (
{ {
time_tClock c; time_tClock c;
#ifdef OS_LINUX
c = ms * sysconf(_SC_CLK_TCK) / 1000;
#else
c = ms * CLK_TCK / 1000; c = ms * CLK_TCK / 1000;
#endif
if (ic != NULL) *ic = c; if (ic != NULL) *ic = c;
...@@ -610,7 +635,12 @@ setInterval ( ...@@ -610,7 +635,12 @@ setInterval (
if (i == 0) if (i == 0)
return; return;
#ifdef OS_LINUX
*c = i * sysconf(_SC_CLK_TCK) / 1000;
#else
*c = i * CLK_TCK / 1000; *c = i * CLK_TCK / 1000;
#endif
} }
......
src/exp/com/src/os_linux/pwr_pkg.sh
View file @ 9b56a2ac
...@@ -7,9 +7,10 @@ pkg_install_func () ...@@ -7,9 +7,10 @@ pkg_install_func ()
exit 1 exit 1
fi fi
pkg=`eval locate $1`
pkg_remove_func "force" pkg_remove_func "force"
pkg=/home/pwrp/$1
echo "-- Installing package $1" echo "-- Installing package $1"
cd /tmp cd /tmp
if ! tar -xzf $pkg pkg_unpack.sh; then if ! tar -xzf $pkg pkg_unpack.sh; then
......
src/exp/com/src/os_linux/pwrp_env.sh
View file @ 9b56a2ac
...@@ -550,12 +550,6 @@ pwrc_create_func() ...@@ -550,12 +550,6 @@ pwrc_create_func()
# Printer command for plc documents # Printer command for plc documents
#export pwr_foe_gre_print="lpr -P lp1" #export pwr_foe_gre_print="lpr -P lp1"
# Mysql server node
#node=`uname -n`
#if [ $node != "newton" ]; then
# export pwrp_mysql_server="newton"
#fi
if [ -e "$pwrp_login/sysinfo.txt" ]; then if [ -e "$pwrp_login/sysinfo.txt" ]; then
echo "-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_" echo "-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_"
echo "Welcome to" echo "Welcome to"
...@@ -591,9 +585,14 @@ EOF ...@@ -591,9 +585,14 @@ EOF
return return
fi fi
pwrc_set_func "project" $pname
if [ $pwrc_status -ne $pwrc__success ]; then
return
fi
# Create an empty directory database # Create an empty directory database
echo "Creating directory database" echo "Creating directory database"
pwrc_copy_func template -p $pname dbdirectory noconfirm wb_cmd create volume/name=\"directory\"/class=\$DirectoryVolume/ident=254.254.254.253
return return
fi fi
...@@ -685,14 +684,7 @@ pwrc_delete_func() ...@@ -685,14 +684,7 @@ pwrc_delete_func()
if [ -z $confirm ] || [ $confirm != "noconfirm" ]; then if [ -z $confirm ] || [ $confirm != "noconfirm" ]; then
echo "Delete project will" echo "Delete project will"
echo " remove '$2' from the project list" echo " remove '$2' from the project list"
echo " delete all databases in project '$2':" echo " delete all databases in project '$2'"
i=0
while [ "${db_array[$i]}" != "" ]; do
echo " database: '${db_array[$i]}'"
i=$i+1
done
echo " delete all files in $proot" echo " delete all files in $proot"
echo "Do you want do continue ? [y/n] " echo "Do you want do continue ? [y/n] "
read REPLY read REPLY
...@@ -722,19 +714,6 @@ pwrc_delete_func() ...@@ -722,19 +714,6 @@ pwrc_delete_func()
return return
fi fi
# Delete the databases
i=0
while [ "${db_array[$i]}" != "" ]; do
if mysqladmin -f $mysql_socket drop ${db_array[$i]}
then
echo "Database '${db_array[$i]}' deleted"
else
echo "Error: Error from mysqladmin $mysql_socket drop ${db_array[$i]}"
fi
i=$i+1
done
fi fi
pwrc_prlist_delete $2 pwrc_prlist_delete $2
...@@ -858,9 +837,9 @@ pwrc_set_func() ...@@ -858,9 +837,9 @@ pwrc_set_func()
return return
fi fi
cmd="base" cmd="baseroot"
if [ $1 = $cmd ] || [ ${cmd#$1} != $cmd ]; then if [ $1 = $cmd ] || [ ${cmd#$1} != $cmd ]; then
# Command is "set base" # Command is "set baseroot"
baseroot=$2 baseroot=$2
baseroot=${baseroot%/} baseroot=${baseroot%/}
if [ ! -e "$baseroot" ]; then if [ ! -e "$baseroot" ]; then
...@@ -1275,83 +1254,6 @@ pwrc_copy_func() ...@@ -1275,83 +1254,6 @@ pwrc_copy_func()
pwrc_status=$pwrc__syntax pwrc_status=$pwrc__syntax
return return
fi fi
if [ $1 = "template" ]; then
# Command is "copy template"
if [ $2 == "-p" ]; then
projectname=$3
shift 2
else
pwrc_get_projectname
fi
db=$2
confirm=$3
# This can only be done on mysql server
if [ ! -z "$pwrp_mysql_server" ]; then
node="`eval uname -n`"
if [ $node != $pwrp_mysql_server ]; then
echo "Error: current host is not mysql server ($pwrp_mysql_server)"
pwrc_status=$pwrc__notmysqlsrv
return
fi
fi
if [ -z $db ]; then
echo "Syntax error: enter database, or 'dbdirectory' for directory database"
pwrc_status=$pwrc__syntax
return
fi
# Get location for mysql database
datadir=`eval mysqladmin $mysql_socket variables| grep datadir | awk '{ print $4 }'`
datadir=${datadir%/}
if [ -z $datadir ]; then
echo "Error: Can't get database directory from mysql"
pwrc_status=$pwrc__datadir
return
fi
if [ "$db" = "dbdirectory" ]; then
dbname=$projectname"_"$pwr_dbversion
else
dbname=$projectname"_"$db"_"$pwr_dbversion
fi
if [ -z $confirm ] || [ $confirm != "noconfirm" ]; then
echo "Do you want to copy a template database to $dbname ? [y/n] "
read REPLY
if [ -z $REPLY ] || [ $REPLY != "y" ]; then
return
fi
fi
# Create database directory
if [ ! -e $datadir/$dbname ]; then
echo "Creating new database '$dbname'"
mysqladmin $mysql_socket create $dbname
fi
# if [ ! -e $datadir/wb_template_$pwr_dbversion ]; then
# echo "Can't find template database"
# pwrc_status=$pwrc__notemplatedb
# return
# fi
# Copy template database
if wb_cp $datadir/wb_template_$pwr_dbversion/ $datadir/$dbname/
then
echo "Template database copied to '"${dbname%"_"$pwr_dbversion}"'"
pwrc_status=$pwrc__success
else
pwrc_status=$pwrc__mysqldbcopy
return
fi
return
fi
cmd="project" cmd="project"
if [ $1 = $cmd ] || [ ${cmd#$1} != $cmd ]; then if [ $1 = $cmd ] || [ ${cmd#$1} != $cmd ]; then
...@@ -1381,35 +1283,6 @@ pwrc_copy_func() ...@@ -1381,35 +1283,6 @@ pwrc_copy_func()
to_phier="-" to_phier="-"
fi fi
# Check that mysqladmin is alive
ver=`eval mysqladmin $mysql_socket --version`
if [ -z "$ver" ]; then
echo "Unable to find mysqladmin"
pwrc_status=$pwrc_mysql
return
fi
# This can only be done on mysql server
if [ ! -z "$pwrp_mysql_server" ]; then
node="`eval uname -n`"
if [ $node != $pwrp_mysql_server ]; then
echo "Error: current host is not mysql server ($pwrp_mysql_server)"
pwrc_status=$pwrc__notmysqlsrv
return
fi
fi
# Get location for mysql database
datadir=`eval mysqladmin $mysql_socket variables| grep datadir | awk '{ print $4 }'`
datadir=${datadir%/}
if [ -z $datadir ]; then
echo "Error: Can't get database directory from mysql"
pwrc_status=$pwrc__datadir
return
fi
# Load project list # Load project list
pwrc_prlist_read pwrc_prlist_read
if [ $pwrc_status -ne $pwrc__success ]; then if [ $pwrc_status -ne $pwrc__success ]; then
...@@ -1459,41 +1332,13 @@ pwrc_copy_func() ...@@ -1459,41 +1332,13 @@ pwrc_copy_func()
from_proot=${root_array[$pwrc_current_index]} from_proot=${root_array[$pwrc_current_index]}
# Get databases in from-project
pwrc_dblist_read $from_pname $from_proot
# Check that the databases can be found and that the new doesn't exist
i=0
while [ "${db_array[$i]}" != "" ]; do
if [ ! -e $datadir/${db_array[$i]} ]; then
echo "Error: Can't find database ${db_array[$i]}"
pwrc_status=$pwrc__nodb
return
fi
dbname=$to_pname${db_array[$i]#$from_pname}
if [ -e $datadir/$dbname ]; then
echo "Error: Database '$dbname' already exist"
pwrc_status=pwrc__dbalrexist
return
fi
i=$i+1
done
# Confirmation # Confirmation
if [ -z $confirm ] || [ $confirm != "noconfirm" ]; then if [ -z $confirm ] || [ $confirm != "noconfirm" ]; then
echo "Copy project will" echo "Copy project will"
echo " add '$to_pname' to the project list" echo " add '$to_pname' to the project list"
echo " copy directory tree '$from_proot' to '$to_proot'" echo " copy directory tree '$from_proot' to '$to_proot'"
echo " copy all databases in project '$from_pname':"
i=0
while [ "${db_array[$i]}" != "" ]; do
echo " database: '${db_array[$i]}'"
i=$i+1
done
echo "Do you want do continue ? [y/n] " echo "Do you want do continue ? [y/n] "
read REPLY read REPLY
if [ -z $REPLY ] || [ $REPLY != "y" ]; then if [ -z $REPLY ] || [ $REPLY != "y" ]; then
...@@ -1511,29 +1356,6 @@ pwrc_copy_func() ...@@ -1511,29 +1356,6 @@ pwrc_copy_func()
return return
fi fi
#Copy databases
i=0
while [ "${db_array[$i]}" != "" ]; do
dbname=$to_pname${db_array[$i]#$from_pname}
if mysqladmin $mysql_socket create $dbname
then
echo "Database '$dbname' created"
else
echo "Error: mysqladmin error"
pwrc_status=$pwrc__dbcreate
return
fi
if wb_cp $datadir/${db_array[$i]}/ $datadir/$dbname/
then
echo "Database $datadir/${db_array[$i]} copied"
else
pwrc_status=pwrc__mysqldbcopy
return
fi
i=$i+1
done
# Add new project into project list # Add new project into project list
pwrc_prlist_add dummy $to_pname ${base_array[pwrc_current_index]} $to_proot $to_phier ${desc_array[pwrc_current_index]} "(Copy of $from_pname)" pwrc_prlist_add dummy $to_pname ${base_array[pwrc_current_index]} $to_proot $to_phier ${desc_array[pwrc_current_index]} "(Copy of $from_pname)"
pwrc_prlist_write pwrc_prlist_write
...@@ -1549,59 +1371,10 @@ pwrc_copy_func() ...@@ -1549,59 +1371,10 @@ pwrc_copy_func()
pwrc_setdb_func() pwrc_setdb_func()
{ {
if [ "$1" == "dbdirectory" ]; then echo "setdb is obsolete"
db=""
else
db=$1
fi
# Command is "setdb"
pwrc_get_projectname
if [ -z "$pwrp_root" ]; then
echo "No project is set"
pwrc_status=$pwrc__projnotset
return
fi
if [ -z $db ]; then
# Set directory db
if [ ! -z "$pwrp_mysql_server" ]; then
node="`eval uname -n`"
if [ $node = $pwrp_mysql_server ]; then
export PWRP_DB=:$projectname"_"$pwr_dbversion
else
export PWRP_DB=$pwrp_mysql_server:$projectname"_"$pwr_dbversion
fi
else
export PWRP_DB=:$projectname"_"$pwr_dbversion
fi
else
# Database is supplied
if [ ! -z "$pwrp_mysql_server" ]; then
node="`eval uname -n`"
if [ $node = $pwrp_mysql_server ]; then
export PWRP_DB=:$projectname"_"$db"_"$pwr_dbversion
else
export PWRP_DB=$pwrp_mysql_server:$projectname"_"$db"_"$pwr_dbversion
fi
else
export PWRP_DB=:$projectname"_"$db"_"$pwr_dbversion
fi
fi
echo "Database set to $db ($PWRP_DB)"
pwrc_status=$pwrc__success pwrc_status=$pwrc__success
} }
pwrc_mysql_func()
{
mysql $mysql_socket $1
}
pwrc_help_func() pwrc_help_func()
{ {
cat << EOF cat << EOF
...@@ -1611,14 +1384,11 @@ pwrp_env.sh - Utilities for pwr project environment ...@@ -1611,14 +1384,11 @@ pwrp_env.sh - Utilities for pwr project environment
help - Display help help - Display help
create project 'name' - Create at new project create project 'name' - Create at new project
set project 'name' - Setup environment to a project set project 'name' - Setup environment to a project
set base 'root' - Setup environment to proview base distribution set baseroot 'root' - Setup environment to proview base distribution
set db ['db'] - Set database. If db ommitted, directory db is set. set db ['db'] - Set database. If db ommitted, directory db is set.
show project - Show current project show project - Show current project
show projects - Show all projects show projects - Show all projects
show base - Show current base root show base - Show current base root
show db - Show current database
show db 'database' - Check that database exist
copy template 'db' - Copy a template database to database 'db'
EOF EOF
} }
...@@ -1633,7 +1403,6 @@ pwrc_parse () ...@@ -1633,7 +1403,6 @@ pwrc_parse ()
platform="x86_linux" platform="x86_linux"
os="os_linux" os="os_linux"
hw="hw_x86" hw="hw_x86"
#mysql_socket="--socket /var/lib/mysql/mysql.sock"
local cmd local cmd
...@@ -1692,11 +1461,6 @@ pwrc_parse () ...@@ -1692,11 +1461,6 @@ pwrc_parse ()
shift shift
pwrc_setdb_func $@ pwrc_setdb_func $@
return $pwrc_status return $pwrc_status
fi
if [ $1 = "mysql" ]; then
shift
pwrc_mysql_func $@
return
else else
echo "Unknown command" echo "Unknown command"
fi fi
......
src/exp/com/src/os_linux/upgrade.sh
View file @ 9b56a2ac
...@@ -12,152 +12,12 @@ let reload__loaddb=4 ...@@ -12,152 +12,12 @@ let reload__loaddb=4
let pass__continue=1 let pass__continue=1
let pass__execute=2 let pass__execute=2
v34_root="/data1/pwr/x3-4b/rls_dbg"
reload_createproject()
{
reload_checkpass "createproject" $start_pass
if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success
return
fi
cat << EOF
You should now create the project in wb_adm.
Login in wb_adm and activate 'Create project' from
the menu.
EOF
reload_continue "Pass create project"
wb_adm
source pwrp_env.sh set project $project
}
reload_copyfile()
{
reload_checkpass "copyfile" $start_pass
if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success
return
fi
echo "*********************************************************************"
echo ""
echo "Before this pass upgrade.com on VMS should be executed !"
echo ""
echo "**********************************************************************"
reload_continue "Pass copy files"
if [ -e $pwrp_tmp/upgrade_files.sh ]; then
source $pwrp_tmp/upgrade_files.sh
else
echo ""
echo "Files copied from VMS host is missing on \$pwrp_tmp"
echo ""
fi
}
reload_createdbs()
{
reload_checkpass "createdbs" $start_pass
if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success
return
fi
cat > $pwrp_tmp/rename_dbid.pwr_com << EOF
! Script to change dbid in dbconfig objects to lowercase
!
main()
string name;
string value;
string attr;
string class;
int sts;
string volume;
verify(0);
volume = GetVolumeList();
while ( volume != "")
class = GetVolumeClass( volume);
if ( class == "\$DirectoryVolume")
break;
endif
volume = GetNextVolume( volume);
endwhile
if ( volume == "")
exit(0);
endif
set volume/volume='volume'
name = GetRootList();
while ( name != "")
class = GetObjectClass( name);
if ( class == "DbConfig")
attr = name + ".Id";
value = GetAttribute( attr, sts);
if ( sts)
value = tolower( value);
set attr/name='name'/attr=Id/value="'value'"/noconfirm
endif
endif
if ( class == "NodeConfig")
attr = name + ".NodeName";
value = GetAttribute( attr, sts);
if ( sts)
value = tolower( value);
set attr/name='name'/attr=NodeName/value="'value'"/noconfirm
endif
attr = name + ".BootNode";
value = GetAttribute( attr, sts);
if ( sts)
value = tolower( value);
set attr/name='name'/attr=BootNode/value="'value'"/noconfirm
endif
endif
if ( class == "\$System")
attr = name + ".SystemName";
value = GetAttribute( attr, sts);
if ( sts)
value = tolower( value);
set attr/name='name'/attr=SystemName/value="'value'"/noconfirm
endif
endif
name = GetNextSibling(name);
endwhile
save
endmain
EOF
wb_cmd @$pwrp_tmp/rename_dbid.pwr_com
cat << EOF
You should now enter the project volume, and check that the
volume is loaded correctly.
You should then set edit mode, and save.
This operation will create the databases that are configured in
the project volume.
EOF
reload_continue "Pass create databases"
source pwrp_env.sh setdb
wb sysansv sysansv
}
reload_dumpdb() reload_dumpdb()
{ {
# Dump V3.4b databases, one wbload file per volume
reload_checkpass "dumpdb" $start_pass reload_checkpass "dumpdb" $start_pass
if [ $pass_status -ne $pass__execute ]; then if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success reload_status=$reload__success
...@@ -166,225 +26,195 @@ reload_dumpdb() ...@@ -166,225 +26,195 @@ reload_dumpdb()
reload_continue "Pass dump database" reload_continue "Pass dump database"
rm $pwrp_db/*.wb_dmp
for cdb in $databases; do for cdb in $databases; do
echo "Dumping database $cdb" echo "Dumping database $cdb"
source pwrp_env.sh setdb $cdb export pwr_inc=$v34_root/os_linux/hw_x86/exp/inc
source $v34_root/os_linux/hw_x86/exp/exe/pwrp_env.sh setdb $cdb
if [ $cdb != "dbdirectory" ]; then export pwr_inc=$pwrb_root/os_linux/hw_x86/exp/inc
#Store versions of classvolumes
wb_cmd @$pwr_exe/reload_vol_versions $cdb # Create a script that dumps each volume
fi tmpfile=$pwrp_tmp/dump.sh
cat > $tmpfile <<-EOF
dump_file=$pwrp_db/$cdb.wb_dmp main()
reload_save_file $dump_file string v;
wb_cmd wb dump/out=\"$dump_file\" string class;
string outfile;
v = GetVolumeList();
while( v != "")
class = GetVolumeClass( v);
if ( class != "\$ClassVolume")
outfile = "$pwrp_db/" + v + ".wb_dmp";
outfile = tolower( outfile);
printf( "-- Dump volume %s to %s\n", v, outfile);
wb dump/v40/volume='v'/out="'outfile'"
endif
v = GetNextVolume( v);
endwhile
endmain
EOF
chmod a+x $tmpfile
$v34_root/os_linux/hw_x86/exp/exe/wb_cmd @$tmpfile
done done
} }
reload_templatedb() reload_userclasses()
{ {
reload_checkpass "templatedb" $start_pass reload_checkpass "userclasses" $start_pass
if [ $pass_status -ne $pass__execute ]; then if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success reload_status=$reload__success
return return
fi fi
reload_continue "Pass copy template database" reload_continue "Pass load userclasses"
for cdb in $databases; do # Load userclasses
echo "-- Copy template database to $cdb" fname="$pwrp_db/userclasses.wb_load"
if [ -e $fname ]; then
source pwrp_env.sh copy template $cdb noconfirm echo "-- Loading userclasses $fname"
done
volume=`eval grep pwr_eClass_ClassVolume $fname | awk '{ print tolower($2) }'`
if wb_cmd create snapshot/file=\"$fname\"/out=\"$pwrp_load/$volume.dbs\"
then
reload_status=$reload__success
else
reload_status=$reload__userclasses
return
fi
fi
} }
reload_userclasses() reload_dirvolume()
{ {
reload_checkpass "userclasses" $start_pass reload_checkpass "dirvolume" $start_pass
if [ $pass_status -ne $pass__execute ]; then if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success reload_status=$reload__success
return return
fi fi
reload_continue "Pass load userclasses" reload_continue "Pass dirvolume"
databases=`eval source pwrp_env.sh show db -a` dmpfiles=`eval ls $pwrp_db/*.wb_dmp`
echo $dmpfiles
for cdb in $databases; do
if [ $cdb != "dbdirectory" ]; then for dmpfile in $dmpfiles; do
source pwrp_env.sh setdb $cdb volume=`eval grep DirectoryVolume $dmpfile | awk '{ print $2 }'`
if [ ! -z "$volume" ]; then
# Load usertypes echo "Volume: $volume"
fname="$pwrp_db/$cdb/usertypes.wb_load" #mv $dmpfile $pwrp_db/directory.wb_dmp
list_file="$pwrp_db/"$cdb"_usertypes.lis" l1="Volume $volume \$DirectoryVolume"
if [ -e $fname ]; then l2="Volume Directory \$DirectoryVolume"
echo "-- Loading usertypes in $cdb $fname" sed 's/ '$volume' / Directory /' $dmpfile > $pwrp_db/directory.wb_dmp
if wb_cmd wb load/load=\"$fname\"/out=\"$list_file\" wb_cmd wb load /load=\"$pwrp_db/directory.wb_dmp\"
then mv $dmpfile $dmpfile"_old"
reload_status=$reload__success mv $pwrp_db/directory.wb_dmp $pwrp_db/directory.wb_dmp_old
else break
reload_status=$reload__usertypes else
cat $list_file db=""
return
fi
else
fname="$pwrp_db/usertypes.wb_load"
list_file="$pwrp_db/"$cdb"_usertypes.lis"
if [ -e $fname ]; then
echo "-- Loading usertypes in $cdb $fname"
if wb_cmd wb load/load=\"$fname\"/out=\"$list_file\"
then
reload_status=$reload__success
else
reload_status=$reload__usertypes
cat $list_file
return
fi
fi
fi
# Load userclasses
fname="$pwrp_db/$cdb/userclasses.wb_load"
list_file="$pwrp_db/"$cdb"_userclasses.lis"
if [ -e $fname ]; then
echo "-- Loading userclasses in $cdb $fname"
if wb_cmd wb load/load=\"$fname\"/out=\"$list_file\"
then
reload_status=$reload__success
else
reload_status=$reload__userclasses
cat $list_file
return
fi
else
fname="$pwrp_db/userclasses.wb_load"
list_file="$pwrp_db/"$cdb"_userclasses.lis"
if [ -e $fname ]; then
echo "-- Loading userclasses in $cdb $fname"
if wb_cmd wb load/load=\"$fname\"/out=\"$list_file\"
then
reload_status=$reload__success
else
reload_status=$reload__userclasses
cat $list_file
return
fi
fi
fi
fi fi
done done
} }
reload_settemplate() reload_cnvdirvolume()
{ {
reload_checkpass "settemplate" $start_pass reload_checkpass "cnvdirvolume" $start_pass
if [ $pass_status -ne $pass__execute ]; then if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success reload_status=$reload__success
return return
fi fi
cat << EOF reload_continue "Pass cnvdirvolume"
The set_template file should be converted from a VMS-command file
to a pwrc script.
Remove all VMS rows, beginning with $, and save the file. # Create a script that dumps each volume
tmpfile=$pwrp_tmp/cnvdirvolume.sh
cat > $tmpfile << EOF
main
string object;
string class;
string child;
string sibling;
nedit will be started so you can do this. set volume/volume=Directory
Then the file will be executed. ! verify(1);
object = GetRootList();
while ( object != "")
class = GetObjectClass( object);
if ( class == "DbConfig")
child = GetChild( object);
while ( child != "")
sibling = GetNextSibling( child);
move object/source='child'/dest='object'/after
child = sibling;
endwhile
sibling = GetNextSibling( object);
delete object/noconf/nolog/name='object'
object = sibling;
else
object = GetNextSibling( object);
endif
endwhile
save
endmain
EOF EOF
chmod a+x $tmpfile
reload_continue "Pass set template values" wb_cmd @$tmpfile
nedit $pwrp_db/set_template.pwr_com
databases=`eval source pwrp_env.sh show db -a`
fname="$pwrp_db/set_template.pwr_com"
if [ -e $fname ]; then
for cdb in $databases; do
if [ $cdb != "dbdirectory" ]; then
source pwrp_env.sh setdb $cdb
echo "-- Setting template values in $cdb $fname"
if wb_cmd @$fname
then
reload_status=$reload__success
else
reload_status=$reload__settemplate
return
fi
fi
done
else
echo "-- No set_template file found"
reload_status=$reload__success
fi
} }
reload_loaddb()
reload_createvolumes()
{ {
reload_checkpass "loaddb" $start_pass reload_checkpass "createvolumes" $start_pass
if [ $pass_status -ne $pass__execute ]; then if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success reload_status=$reload__success
return return
fi fi
reload_continue "Pass load database" reload_continue "Pass create volumes"
databases=`eval source pwrp_env.sh show db -a`
for cdb in $databases; do dmpfiles=`eval ls $pwrp_db/*.wb_dmp`
echo "-- Loading database $cdb" echo $dmpfiles
source pwrp_env.sh setdb $cdb
if [ $cdb != "dbdirectory" ]; then for dmpfile in $dmpfiles; do
#Restore versions of classvolumes file=${dmpfile##/*/}
if [ -e $pwrp_db/reload_vol_versions_$cdb.pwr_com ]; then db="${file%.*}.db"
wb_cmd @$pwrp_db/reload_vol_versions_$cdb if [ $db = "wb.db" ]; then
fi db=""
fi
dump_file=$pwrp_db/$cdb.wb_dmp
list_file=$pwrp_db/$cdb.lis
if wb_cmd wb load/load=\"$dump_file\"/out=\"$list_file\"/ignore
then
reload_status=$reload__success
else else
cat $list_file wb_cmd wb load /load=\"$dmpfile\"
reload_status=$reload__loaddb
fi fi
done done
} }
reload_convertdb() reload_localwb()
{ {
reload_checkpass "convertdb" $start_pass reload_checkpass "localwb" $start_pass
if [ $pass_status -ne $pass__execute ]; then if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success reload_status=$reload__success
return return
fi fi
reload_continue "Pass convert database" reload_continue "Pass create localWb volume"
databases=`eval source pwrp_env.sh show db -a` cat << EOF >> $pwrp_db/wb.wb_load
!
! localWB volume
! This volume contains template objects and local listdescriptors.
!
Volume localWb pwr_eClass_WorkBenchVolume 254.254.254.252
EndVolume
for cdb in $databases; do EOF
echo "-- Loading database $cdb"
source pwrp_env.sh setdb $cdb
wb_drive_convert sed 's/SObject wb:/SObject localWb:/' $pwrp_db/wb.wb_dmp >> $pwrp_db/wb.wb_load
done
} }
reload_loaddirectorydb() reload_loaddb()
{ {
reload_checkpass "loaddirectorydb" $start_pass reload_checkpass "loaddb" $start_pass
if [ $pass_status -ne $pass__execute ]; then if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success reload_status=$reload__success
return return
...@@ -392,13 +222,12 @@ reload_loaddirectorydb() ...@@ -392,13 +222,12 @@ reload_loaddirectorydb()
reload_continue "Pass load database" reload_continue "Pass load database"
databases="dbdirectory" databases=`eval source pwrp_env.sh show db -a`
for cdb in $databases; do for cdb in $databases; do
echo "-- Loading database $cdb" echo "-- Loading database $cdb"
source pwrp_env.sh setdb $cdb source pwrp_env.sh setdb $cdb
wb_cmd delete volume/name=ProjectVolume/noconf
if [ $cdb != "dbdirectory" ]; then if [ $cdb != "dbdirectory" ]; then
#Restore versions of classvolumes #Restore versions of classvolumes
...@@ -413,7 +242,8 @@ reload_loaddirectorydb() ...@@ -413,7 +242,8 @@ reload_loaddirectorydb()
then then
reload_status=$reload__success reload_status=$reload__success
else else
reload_status=$reload__success cat $list_file
reload_status=$reload__loaddb
fi fi
done done
} }
...@@ -428,16 +258,7 @@ reload_compile() ...@@ -428,16 +258,7 @@ reload_compile()
reload_continue "Pass compile plcprograms" reload_continue "Pass compile plcprograms"
databases=`eval source pwrp_env.sh show db -a` wb_cmd compile /all
for cdb in $databases; do
if [ $cdb != "dbdirectory" ]; then
source pwrp_env.sh setdb $cdb
echo "-- Compiling database $cdb"
wb_cmd compile/allvolumes
fi
done
reload_status=$reload__success reload_status=$reload__success
} }
...@@ -471,16 +292,7 @@ reload_createload() ...@@ -471,16 +292,7 @@ reload_createload()
echo "-- Removing old loadfiles" echo "-- Removing old loadfiles"
rm $pwrp_load/ld_vol*.dat rm $pwrp_load/ld_vol*.dat
databases=`eval source pwrp_env.sh show db -a` wb_cmd create load/all
for cdb in $databases; do
if [ $cdb != "dbdirectory" ]; then
source pwrp_env.sh setdb $cdb
echo "-- Creating loadfiles for database $cdb"
wb_cmd create load/class/all
fi
done
reload_status=$reload__success reload_status=$reload__success
} }
...@@ -499,6 +311,44 @@ reload_createboot() ...@@ -499,6 +311,44 @@ reload_createboot()
reload_status=$reload__success reload_status=$reload__success
} }
reload_convertge()
{
reload_checkpass "convertge" $start_pass
if [ $pass_status -ne $pass__execute ]; then
reload_status=$reload__success
return
fi
reload_continue "Pass convert ge graphs"
# Create a script that dumps each volume
tmpfile=$pwrp_tmp/convertv40.ge_com
cat > $tmpfile << EOF
function int process( string graph)
open 'graph'
printf( "Converting %s...\n", graph);
convert v40
save
endfunction
main()
EOF
list=`eval ls -1 $pwrp_pop/*.pwg`
for file in $list; do
file=${file##/*/}
file=${file%%.*}
echo "process( \"$file\");" >> $tmpfile
done
echo "exit" >> $tmpfile
echo "endmain" >> $tmpfile
chmod a+x $tmpfile
wb_ge @$tmpfile
reload_status=$reload__success
}
reload_exit() reload_exit()
{ {
source pwrp_env.sh setdb source pwrp_env.sh setdb
...@@ -578,27 +428,22 @@ usage() ...@@ -578,27 +428,22 @@ usage()
- Create project on linux (Pass 1) - Create project on linux (Pass 1)
- Execute upgrade.com on V3.3 - Execute upgrade.com on V3.3
- Contiue with pass copyfile - Continue with pass copyfile
Arguments Project name. Arguments Project name.
Pass Pass
createproject Create project on linux dumpdb Dump database to textfile \$pwrp_db/'volume'.wb_dmp
copyfile Distribute files copied from V3.3 userclasses Load userclasses.wb_load
loaddirectorydb Load the project volume into the directory db. dirvolume Create directory volume.
createdbs Create configured databases. cnvdirvolume Convert the directory volume.
userclasses Load userclasses.wb_load (and usertypes.wb_load) createvolumes Create configured databases.
reload will first the load_files in \$pwrp_db/'dbid'/ localwb Create LocalWb volume for lists and template objects.
and then in \$pwrp_db/
settemplate Set template values. \$pwrp_db/set_template.pwr_com is
executed
loaddb Load the dump into the new database
convertdb Convert some classes (Document classes)
compile Compile all plcprograms in the database compile Compile all plcprograms in the database
createload Create new loadfiles. createload Create new loadfiles.
createboot Create bootfiles for all nodes in the project. createboot Create bootfiles for all nodes in the project.
convertge Convert ge graphs.
EOF EOF
} }
...@@ -625,14 +470,20 @@ echo "" ...@@ -625,14 +470,20 @@ echo ""
echo "-- Upgrade $project" echo "-- Upgrade $project"
echo "" echo ""
passes="createproject copyfile loaddirectorydb createdbs userclasses settemplate loaddb convertdb compile createload createboot" export pwr_inc=$v34_root/os_linux/hw_x86/exp/inc
echo $pwr_inc
databases=`eval source $v34_root/os_linux/hw_x86/exp/exe/pwrp_env.sh show db -a`
databases=$databases" dbdirectory"
export pwr_inc=$pwrb_root/os_linux/hw_x86/exp/inc
passes="dumpdb userclasses dirvolume cnvdirvolume createvolumes localwb compile createload createboot convertge"
echo "Pass: $passes" echo "Pass: $passes"
echo "" echo ""
echo -n "Enter start pass [createproject] > " echo -n "Enter start pass [dumpdb] > "
read start_pass read start_pass
if [ -z $start_pass ]; then if [ -z $start_pass ]; then
start_pass="createproject" start_pass="dumpdb"
fi fi
for cpass in $passes; do for cpass in $passes; do
......
src/exp/com/src/os_linux/wb_admin.sh
View file @ 9b56a2ac
...@@ -51,12 +51,12 @@ wb_adm_create_func () ...@@ -51,12 +51,12 @@ wb_adm_create_func ()
return $pwrc_status return $pwrc_status
fi fi
source pwrp_env.sh set project $pname #source pwrp_env.sh set project $pname
if [ $pwrc_status -ne 0 ]; then #if [ $pwrc_status -ne 0 ]; then
return $pwrc_status # return $pwrc_status
fi #fi
wb_cmd create volume/name=\"ProjectVolume\"/ident=254.254.254.253/class=\$DirectoryVolume #wb_cmd create volume/name=\"directory\"/ident=254.254.254.253/class=\$DirectoryVolume
fi fi
} }
......
src/exp/com/src/os_linux/wb_start.sh
View file @ 9b56a2ac
...@@ -4,13 +4,6 @@ ...@@ -4,13 +4,6 @@
username=$1 username=$1
password=$2 password=$2
database=$3 volume=$3
volume=$4
if [ -z "$database" ]; then
source pwrp_env.sh setdb
else
source pwrp_env.sh setdb $database
fi
wb $username $password $volume wb $username $password $volume
src/exp/rt/src/os_linux/hw_x86/makefile
View file @ 9b56a2ac
...@@ -54,10 +54,12 @@ realclean : clean $(clean_obj) ...@@ -54,10 +54,12 @@ realclean : clean $(clean_obj)
$(exe_dir)/xtt_help.dat : xtt_help.dat $(exe_dir)/xtt_help.dat : xtt_help.dat
@ echo "Copying xtt_help.dat" @ echo "Copying xtt_help.dat"
@ $(cp) $(cpflags) $(source) $(target) @ $(cp) $(cpflags) $(source) $(target)
@ co_convert -t -d $(pwr_doc)/help $(source)
$(exe_dir)/sv_se/pwrb_xtthelp.dat : ../../pwrb_xtthelp.dat_sv_se $(exe_dir)/sv_se/pwrb_xtthelp.dat : ../../pwrb_xtthelp.dat_sv_se
@ echo "Copying pwrb_xtthelp.dat sv_se" @ echo "Copying pwrb_xtthelp.dat sv_se"
@ $(cp) $(cpflags) $(source) $(target) @ $(cp) $(cpflags) $(source) $(target)
@ co_convert -t -d $(pwr_doc)/sv_se $(source)
$(clean_obj) : clean_%.o : %.c $(clean_obj) : clean_%.o : %.c
......
src/exp/rt/src/pwrb_xtthelp.dat_sv_se
View file @ 9b56a2ac
...@@ -760,7 +760,7 @@ Engelsk text<link> ASup, "", $pwr_exe/pwrb_xtthelp.dat ...@@ -760,7 +760,7 @@ Engelsk text<link> ASup, "", $pwr_exe/pwrb_xtthelp.dat
Larmvervakning av analog storhet ( Analog Supervisory ). Larmvervakning av analog storhet ( Analog Supervisory ).
<h1>Beskrivning <h1>Beskrivning
<image>orm_asup_fo.gif
vervakar analog storhet i godtyckligt objekt med avseende p ver eller vervakar analog storhet i godtyckligt objekt med avseende p ver eller
underskridande av vervakningsgrns. High anger om det r ver eller underskridande av vervakningsgrns. High anger om det r ver eller
underskridande som utgr storhetens larmlge. underskridande som utgr storhetens larmlge.
......
src/lib/rt/src/rt_load.x
View file @ 9b56a2ac
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
%# define load_cNameRttCrrObj "rtt_crro_%3.3d_%3.3d_%3.3d_%3.3d.dat" %# define load_cNameRttCrrObj "rtt_crro_%3.3d_%3.3d_%3.3d_%3.3d.dat"
%# define load_cNameRttCrrCode "rtt_crrc_%3.3d_%3.3d_%3.3d_%3.3d.dat" %# define load_cNameRttCrrCode "rtt_crrc_%3.3d_%3.3d_%3.3d_%3.3d.dat"
%# define load_cNameRttPlc "rtt_plc_%3.3d_%3.3d_%3.3d_%3.3d.dat" %# define load_cNameRttPlc "rtt_plc_%3.3d_%3.3d_%3.3d_%3.3d.dat"
%# define load_cNamePkg "pwrp_pkg_%s_%04d.tgz"
%#endif %#endif
% %
% %
......
src/lib/rt/src/rt_types.c
View file @ 9b56a2ac
...@@ -276,6 +276,7 @@ static types_sEnumElement mask_Distribute_Components[] = { ...@@ -276,6 +276,7 @@ static types_sEnumElement mask_Distribute_Components[] = {
{ 512 , "FlowFiles"}, { 512 , "FlowFiles"},
{ 1024 , "RHostsFile"}, { 1024 , "RHostsFile"},
{ 2048 , "WebFiles"}, { 2048 , "WebFiles"},
{ 4096 , "PwrpStop"},
{ 0, ""}}; { 0, ""}};
static types_sEnum enum_types[] = { static types_sEnum enum_types[] = {
......
src/msg/wb/src/wb_lfu_msg.msg
View file @ 9b56a2ac
...@@ -9,3 +9,4 @@ plcversion <plc version file corrupt> /error ...@@ -9,3 +9,4 @@ plcversion <plc version file corrupt> /error
syntax <syntax error> /error syntax <syntax error> /error
nodename <node does not exist> /error nodename <node does not exist> /error
filecrp <file is corrupt> /error filecrp <file is corrupt> /error
noloadfile <file is no load file> /error
\ No newline at end of file
src/tools/pwre/src/os_linux/pwre.pl
View file @ 9b56a2ac
...@@ -214,6 +214,7 @@ sub build_all () ...@@ -214,6 +214,7 @@ sub build_all ()
_build("lib", "dtt", "all"); _build("lib", "dtt", "all");
_build("exp", "rt", "all"); _build("exp", "rt", "all");
_build("exe", "rt*", "all"); _build("exe", "rt*", "all");
_build("exe", "jpwr*", "all");
_build("exp", "ge", "all"); _build("exp", "ge", "all");
_build("mmi", "*", "copy"); _build("mmi", "*", "copy");
_build("jpwr", "rt", "all"); _build("jpwr", "rt", "all");
...@@ -349,6 +350,7 @@ sub create() ...@@ -349,6 +350,7 @@ sub create()
create_dir($newdir . "/doc/sv_se"); create_dir($newdir . "/doc/sv_se");
create_dir($newdir . "/doc/prm"); create_dir($newdir . "/doc/prm");
create_dir($newdir . "/doc/orm"); create_dir($newdir . "/doc/orm");
create_dir($newdir . "/doc/help");
$newdir = $root . "/tmp"; $newdir = $root . "/tmp";
create_dir($newdir); create_dir($newdir);
......
src/wbl/nmps/src/nmps_c_nmpscell.wb_load
View file @ 9b56a2ac
...@@ -124,6 +124,9 @@ SObject NMps:Class ...@@ -124,6 +124,9 @@ SObject NMps:Class
! !
! 8 When the cell is reseted by the ResetObject, the dataobject is also ! 8 When the cell is reseted by the ResetObject, the dataobject is also
! removed from the database rtdb. ! removed from the database rtdb.
!
! 16 Backup. The cell and data objects in the cell, is backed up by
! the nmps backup process.
!*/ !*/
Object Function $Intern 4 Object Function $Intern 4
Body SysBody Body SysBody
......
src/wbl/nmps/src/nmps_c_nmpsstorecell.wb_load
View file @ 9b56a2ac
...@@ -116,6 +116,9 @@ SObject NMps:Class ...@@ -116,6 +116,9 @@ SObject NMps:Class
! !
! 8 When the cell is reseted by the ResetObject, the dataobject is also ! 8 When the cell is reseted by the ResetObject, the dataobject is also
! removed from the database rtdb. ! removed from the database rtdb.
!
! 16 Backup. The cell and data objects in the cell, is backed up by
! the nmps backup process.
!*/ !*/
Object Function $Intern 4 Object Function $Intern 4
Body SysBody Body SysBody
......
wb/exe/wb_cmd/src/os_linux/wb_cmd.cpp
View file @ 9b56a2ac
...@@ -117,9 +117,16 @@ static int cmd_attach_volume_cb( ...@@ -117,9 +117,16 @@ static int cmd_attach_volume_cb(
cmd->volctx, cmd->volctx,
ldh_eAccess_ReadWrite, ldh_eAccess_ReadWrite,
ldh_eUtility_Pwr); ldh_eUtility_Pwr);
if ( EVEN(sts)) return sts; if ( EVEN(sts)) {
// Try read access
sts = ldh_OpenSession( &cmd->ldhses,
cmd->volctx,
ldh_eAccess_ReadOnly,
ldh_eUtility_Pwr);
if ( EVEN(sts)) return sts;
}
cmd->wnav->volume_attached( cmd->ldhses, pop); cmd->wnav->volume_attached( cmd->wbctx, cmd->ldhses, pop);
return 1; return 1;
} }
...@@ -164,23 +171,25 @@ static void cmd_save_cb( void *ctx) ...@@ -164,23 +171,25 @@ static void cmd_save_cb( void *ctx)
Cmd *cmd = (Cmd *) ctx; Cmd *cmd = (Cmd *) ctx;
int sts; int sts;
if ( !cmd->ldhses) if ( !cmd->ldhses) {
{
cmd->wnav->message( 'E', "Cmd is not attached to a volume"); cmd->wnav->message( 'E', "Cmd is not attached to a volume");
return; return;
} }
sts = ldh_SaveSession( cmd->ldhses); sts = ldh_SaveSession( cmd->ldhses);
if ( EVEN(sts)) if ( EVEN(sts)) {
{
cmd->wnav->message( 'E', wnav_get_message( sts)); cmd->wnav->message( 'E', wnav_get_message( sts));
return; return;
} }
if ( cmd->wb_type == wb_eType_Directory) ldh_sVolumeInfo info;
{ pwr_tCid volcid;
ldh_GetVolumeInfo( ldh_SessionToVol( cmd->ldhses), &info);
ldh_GetVolumeClass( cmd->wbctx, info.Volume, &volcid);
if ( volcid == pwr_eClass_DirectoryVolume) {
sts = lfu_SaveDirectoryVolume( cmd->ldhses, 0); sts = lfu_SaveDirectoryVolume( cmd->ldhses, 0);
if ( EVEN(sts)) if ( EVEN(sts)) {
{
cmd->wnav->message( 'E', "Syntax error"); cmd->wnav->message( 'E', "Syntax error");
return; return;
} }
......
wb/exe/wb_wbltest/src/wb_wbltest.cpp
View file @ 9b56a2ac
...@@ -30,9 +30,9 @@ int main( int argc, char *argv[]) ...@@ -30,9 +30,9 @@ int main( int argc, char *argv[])
wb_vrepdbs *vdbs = new wb_vrepdbs(erep, argv[1]); wb_vrepdbs *vdbs = new wb_vrepdbs(erep, argv[1]);
vdbs->load(); vdbs->load();
wb_dbs dbs(vdbs); // wb_dbs dbs(vdbs);
dbs.setFileName("lasse.dbs"); // dbs.setFileName("lasse.dbs");
dbs.importVolume(*vdbs); // dbs.importVolume(*vdbs);
//wb_orepdbs *op = (wb_orepdbs *)vdbs->object(&sts); //wb_orepdbs *op = (wb_orepdbs *)vdbs->object(&sts);
......
wb/exp/wb/src/os_linux/hw_x86/makefile
View file @ 9b56a2ac
...@@ -75,10 +75,12 @@ realclean : clean $(clean_h) $(clean_c) $(clean_dat) ...@@ -75,10 +75,12 @@ realclean : clean $(clean_h) $(clean_c) $(clean_dat)
$(exe_dir)/wtt_help.dat : wtt_help.dat $(exe_dir)/wtt_help.dat : wtt_help.dat
@ echo "Copying wtt_help.dat" @ echo "Copying wtt_help.dat"
@ $(cp) $(cpflags) $(source) $(target) @ $(cp) $(cpflags) $(source) $(target)
@ co_convert -t -d $(pwr_doc)/help $(source)
$(exe_dir)/ge_help.dat : ge_help.dat $(exe_dir)/ge_help.dat : ge_help.dat
@ echo "Copying ge_help.dat" @ echo "Copying ge_help.dat"
@ $(cp) $(cpflags) $(source) $(target) @ $(cp) $(cpflags) $(source) $(target)
@ co_convert -t -d $(pwr_doc)/help $(source)
$(exe_dir)/pwr_wb_palette.cnf : ../../pwr_wb_palette.cnf $(exe_dir)/pwr_wb_palette.cnf : ../../pwr_wb_palette.cnf
@ echo "Copying pwr_wb_palette.cnf" @ echo "Copying pwr_wb_palette.cnf"
......
wb/exp/wb/src/pwr_wb_palette.cnf
View file @ 9b56a2ac
...@@ -235,6 +235,7 @@ topobjects ProjectNavigatorW1 ...@@ -235,6 +235,7 @@ topobjects ProjectNavigatorW1
class ClassVolumeConfig class ClassVolumeConfig
class SubVolumeConfig class SubVolumeConfig
class WbEnvironment class WbEnvironment
class DbConfig
} }
topobjects ProjectNavigatorW2 topobjects ProjectNavigatorW2
...@@ -263,15 +264,14 @@ palette ProjectNavigatorPalette ...@@ -263,15 +264,14 @@ palette ProjectNavigatorPalette
{ {
class ApplDistribute class ApplDistribute
class ClassVolumeLoad class ClassVolumeLoad
class Distribute
class FriendNodeConfig class FriendNodeConfig
class GraphDistribute
class NodeConfig class NodeConfig
class $NodeHier class $NodeHier
class RootVolumeLoad class RootVolumeLoad
class SharedVolumeLoad class SharedVolumeLoad
class SubVolumeLoad class SubVolumeLoad
class $System class $System
class SystemDistribute
} }
} }
......
xtt/exe/rt_xtt/src/os_linux/link_rule.mk
View file @ 9b56a2ac
...@@ -7,6 +7,6 @@ link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \ ...@@ -7,6 +7,6 @@ link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
-lpwr_ge -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow \ -lpwr_ge -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow \
-lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\ -lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lSM -lICE\ -lSM -lICE\
-ldb -lrpcsvc -lpthread -lm -lrt -ldb-4.0 -lrpcsvc -lpthread -lm -lrt
endif endif
xtt/exe/rt_xtt/src/rt_xtt.cpp
View file @ 9b56a2ac
...@@ -851,6 +851,7 @@ Xtt::Xtt( int argc, char *argv[], int *return_sts) : ...@@ -851,6 +851,7 @@ Xtt::Xtt( int argc, char *argv[], int *return_sts) :
static int reglist_num = (sizeof reglist / sizeof reglist[0]); static int reglist_num = (sizeof reglist / sizeof reglist[0]);
char opplace_str[80] = ""; char opplace_str[80] = "";
int opplace_found = 0; int opplace_found = 0;
pwr_tObjid op_objid;
hot_xtt = this; hot_xtt = this;
...@@ -864,11 +865,29 @@ Xtt::Xtt( int argc, char *argv[], int *return_sts) : ...@@ -864,11 +865,29 @@ Xtt::Xtt( int argc, char *argv[], int *return_sts) :
for ( i = 1; i < argc; i++) { for ( i = 1; i < argc; i++) {
if ( strcmp( argv[i], "-l") == 0 && i + 1 < argc) if ( strcmp( argv[i], "-l") == 0 && i + 1 < argc)
Lng::set( argv[i+1]); Lng::set( argv[i+1]);
else if ( strcmp( argv[i], "-u") == 0 && i + 1 < argc) {
char oname[80];
strcpy( opplace_str, argv[i+1]);
sts = gdh_GetClassList( pwr_cClass_OpPlace, &op_objid);
while (ODD(sts)) {
sts = gdh_ObjidToName( op_objid, oname, sizeof(oname), cdh_mName_object);
if (ODD(sts) && cdh_NoCaseStrcmp( oname, opplace_str) == 0) {
sts = gdh_ObjidToName( op_objid, opplace_str, sizeof(opplace_str), cdh_mNName);
opplace_found = 1;
break;
}
}
if ( !opplace_found) {
printf("** Unable to find opplace\n");
exit(sts);
}
}
} }
if ( argc >= 2 && strncmp( argv[1], "-", 1) != 0) if ( !opplace_found && argc >= 2 && strncmp( argv[1], "-", 1) != 0)
{ {
pwr_tObjid op_objid;
pwr_tClassId op_class; pwr_tClassId op_class;
// First argument is opplace object // First argument is opplace object
...@@ -884,8 +903,7 @@ Xtt::Xtt( int argc, char *argv[], int *return_sts) : ...@@ -884,8 +903,7 @@ Xtt::Xtt( int argc, char *argv[], int *return_sts) :
sts = gdh_GetObjectClass( op_objid, &op_class); sts = gdh_GetObjectClass( op_objid, &op_class);
if ( EVEN(sts)) exit( sts); if ( EVEN(sts)) exit( sts);
if ( op_class != pwr_cClass_OpPlace) if ( op_class != pwr_cClass_OpPlace) {
{
printf("** Error in opplace object class\n"); printf("** Error in opplace object class\n");
exit(sts); exit(sts);
} }
......
xtt/exe/wb_ge/src/wb_ge.c
View file @ 9b56a2ac
...@@ -90,10 +90,24 @@ int main( int argc, char *argv[]) ...@@ -90,10 +90,24 @@ int main( int argc, char *argv[])
XtManageChild(mainwindow); XtManageChild(mainwindow);
if ( argc > 1) printf( "Argc: %d\n", argc);
{ if ( argc > 1) {
strcpy( graph_name, argv[1]); printf( "Arg: %s\n", argv[1]);
ge_new( NULL, mainwindow, 0, 1, graph_name); if ( argv[1][0] == '@') {
// Execute script
void *gectx;
pwr_tStatus sts;
gectx = ge_new( NULL, mainwindow, 0, 1, NULL);
sts = ge_command( gectx, argv[1]);
if ( EVEN(sts))
ge_message( gectx, sts);
}
else {
// Open graph
strcpy( graph_name, argv[1]);
ge_new( NULL, mainwindow, 0, 1, graph_name);
}
} }
else else
ge_new( NULL, mainwindow, 0, 1, NULL); ge_new( NULL, mainwindow, 0, 1, NULL);
......
xtt/lib/ge/src/ge.cpp
View file @ 9b56a2ac
...@@ -2542,6 +2542,18 @@ int ge_generate_web( ldh_tSesContext ldhses) ...@@ -2542,6 +2542,18 @@ int ge_generate_web( ldh_tSesContext ldhses)
return Graph::generate_web( ldhses); return Graph::generate_web( ldhses);
} }
int ge_command( void *ge_ctx, char *cmd)
{
ge_tCtx gectx = (ge_tCtx) ge_ctx;
return gectx->graph->command( cmd);
}
void ge_message( void *ge_ctx, pwr_tStatus sts)
{
ge_tCtx gectx = (ge_tCtx) ge_ctx;
gectx->graph->message( sts);
}
void ge_del( void *ge_ctx) void ge_del( void *ge_ctx)
{ {
ge_tCtx gectx = (ge_tCtx) ge_ctx; ge_tCtx gectx = (ge_tCtx) ge_ctx;
...@@ -2907,3 +2919,9 @@ void *ge_new( void *parent_ctx, ...@@ -2907,3 +2919,9 @@ void *ge_new( void *parent_ctx,
} }
xtt/lib/ge/src/ge.h
View file @ 9b56a2ac
...@@ -24,6 +24,8 @@ void ge_open( void *ge_ctx, char *name); ...@@ -24,6 +24,8 @@ void ge_open( void *ge_ctx, char *name);
void ge_save( void *ge_ctx, char *name); void ge_save( void *ge_ctx, char *name);
void ge_clear( void *ge_ctx); void ge_clear( void *ge_ctx);
int ge_generate_web( ldh_tSesContext ldhses); int ge_generate_web( ldh_tSesContext ldhses);
int ge_command( void *ge_ctx, char *cmd);
void ge_message( void *ge_ctx, pwr_tStatus sts);
#if defined __cplusplus #if defined __cplusplus
} }
......
xtt/lib/ge/src/ge_dyn.cpp
View file @ 9b56a2ac
...@@ -2029,6 +2029,9 @@ int GeInvisible::disconnect( grow_tObject object) ...@@ -2029,6 +2029,9 @@ int GeInvisible::disconnect( grow_tObject object)
int GeInvisible::scan( grow_tObject object) int GeInvisible::scan( grow_tObject object)
{ {
if ( !p)
return 1;
if ( !first_scan) { if ( !first_scan) {
if ( old_value == *p) { if ( old_value == *p) {
// No change since last time // No change since last time
...@@ -5885,6 +5888,9 @@ int GeRadioButton::disconnect( grow_tObject object) ...@@ -5885,6 +5888,9 @@ int GeRadioButton::disconnect( grow_tObject object)
int GeRadioButton::scan( grow_tObject object) int GeRadioButton::scan( grow_tObject object)
{ {
if ( !p)
return 1;
if ( !first_scan) { if ( !first_scan) {
if ( old_value == *p) { if ( old_value == *p) {
// No change since last time // No change since last time
......
xtt/lib/ge/src/ge_dyn.h
View file @ 9b56a2ac
...@@ -998,7 +998,7 @@ class GeValueInput : public GeDynElem { ...@@ -998,7 +998,7 @@ class GeValueInput : public GeDynElem {
{} {}
GeValueInput( const GeValueInput& x) : GeValueInput( const GeValueInput& x) :
GeDynElem(x.dyn,x.dyn_type,x.action_type,x.prio), min_value(x.min_value), GeDynElem(x.dyn,x.dyn_type,x.action_type,x.prio), min_value(x.min_value),
max_value(x.max_value) max_value(x.max_value), clear(x.clear), popup(x.popup)
{} {}
void get_attributes( attr_sItem *attrinfo, int *item_count); void get_attributes( attr_sItem *attrinfo, int *item_count);
void save( ofstream& fp); void save( ofstream& fp);
......
xtt/lib/ge/src/ge_graph.cpp
View file @ 9b56a2ac
...@@ -39,6 +39,7 @@ extern "C" { ...@@ -39,6 +39,7 @@ extern "C" {
extern "C" { extern "C" {
#include "co_mrm_util.h" #include "co_mrm_util.h"
#include "co_msg.h"
#include "flow_x.h" #include "flow_x.h"
} }
#include "co_lng.h" #include "co_lng.h"
...@@ -106,6 +107,14 @@ static int graph_get_current_colors_cb( void *g, glow_eDrawType *fill_color, ...@@ -106,6 +107,14 @@ static int graph_get_current_colors_cb( void *g, glow_eDrawType *fill_color,
static int graph_grow_cb( GlowCtx *ctx, glow_tEvent event); static int graph_grow_cb( GlowCtx *ctx, glow_tEvent event);
void Graph::message( pwr_tStatus sts)
{
char msg[80];
msg_GetMsg( sts, msg, sizeof(msg));
message('I', msg);
}
void Graph::message( char sev, char *text) void Graph::message( char sev, char *text)
{ {
(message_cb)( parent_ctx, sev, text); (message_cb)( parent_ctx, sev, text);
......
xtt/lib/ge/src/ge_graph.h
View file @ 9b56a2ac
...@@ -471,6 +471,12 @@ class Graph { ...@@ -471,6 +471,12 @@ class Graph {
*/ */
void message( char sev, char *text); void message( char sev, char *text);
//! Print a status message
/*!
\param sts Status code.
*/
void message( pwr_tStatus sts);
int grow_pop(); int grow_pop();
int grow_push(); int grow_push();
int grow_push_all(); int grow_push_all();
......
xtt/lib/ge/src/ge_graph_command.cpp
View file @ 9b56a2ac
...@@ -2478,13 +2478,15 @@ int Graph::command( char* input_str) ...@@ -2478,13 +2478,15 @@ int Graph::command( char* input_str)
int sts, sym_sts; int sts, sym_sts;
char symbol_value[80]; char symbol_value[80];
dcli_toupper( input_str, input_str);
sts = dcli_replace_symbol( input_str, command, sizeof(command));
if ( EVEN(sts)) return sts;
if ( input_str[0] == '@') if ( input_str[0] == '@')
{ {
/* Read command file */ /* Read command file */
char *s;
if ( (s = strchr( input_str, ' ')))
dcli_toupper( s, s);
sts = dcli_replace_symbol( input_str, command, sizeof(command));
if ( EVEN(sts)) return sts;
sts = readcmdfile( &command[1]); sts = readcmdfile( &command[1]);
if ( sts == DCLI__NOFILE) if ( sts == DCLI__NOFILE)
{ {
...@@ -2495,6 +2497,10 @@ int Graph::command( char* input_str) ...@@ -2495,6 +2497,10 @@ int Graph::command( char* input_str)
return DCLI__SUCCESS; return DCLI__SUCCESS;
} }
dcli_toupper( input_str, input_str);
sts = dcli_replace_symbol( input_str, command, sizeof(command));
if ( EVEN(sts)) return sts;
sts = dcli_cli( (dcli_tCmdTable *)&graph_command_table, command, (void *) this, 0); sts = dcli_cli( (dcli_tCmdTable *)&graph_command_table, command, (void *) this, 0);
if ( sts == DCLI__COM_NODEF) if ( sts == DCLI__COM_NODEF)
{ {
......
xtt/lib/glow/src/glow_growbar.cpp
View file @ 9b56a2ac
...@@ -759,8 +759,6 @@ void GrowBar::convert( glow_eConvert version) ...@@ -759,8 +759,6 @@ void GrowBar::convert( glow_eConvert version)
GrowRect::convert( version); GrowRect::convert( version);
bar_drawtype = GlowColor::convert( version, bar_drawtype); bar_drawtype = GlowColor::convert( version, bar_drawtype);
bar_bordercolor = GlowColor::convert( version, bar_bordercolor); bar_bordercolor = GlowColor::convert( version, bar_bordercolor);
original_fill_drawtype = GlowColor::convert( version, original_fill_drawtype);
fill_drawtype = GlowColor::convert( version, fill_drawtype);
break; break;
} }
......
xtt/lib/glow/src/glow_grownode.cpp
View file @ 9b56a2ac
...@@ -1949,7 +1949,10 @@ void GrowNode::convert( glow_eConvert version) ...@@ -1949,7 +1949,10 @@ void GrowNode::convert( glow_eConvert version)
original_border_drawtype = GlowColor::convert( version, original_border_drawtype); original_border_drawtype = GlowColor::convert( version, original_border_drawtype);
original_fill_drawtype = GlowColor::convert( version, original_fill_drawtype); original_fill_drawtype = GlowColor::convert( version, original_fill_drawtype);
fill_drawtype = GlowColor::convert( version, fill_drawtype); fill_drawtype = GlowColor::convert( version, fill_drawtype);
if ( trace.attr_type == 3 || trace.attr_type == 4 || trace.attr_type == 12) { if ( trace.attr_type == 3 || trace.attr_type == 4 || trace.attr_type == 12 ||
trace.attr_type == 1010 || trace.attr_type == 1011 || trace.attr_type == 1012 ||
trace.attr_type == 1013 || trace.attr_type == 1014 || trace.attr_type == 1015 ||
trace.attr_type == 1016 || trace.attr_type == 1021 || trace.attr_type == 1023) {
if ( (glow_eDrawTone) trace.color == glow_eDrawTone_YellowGreen) if ( (glow_eDrawTone) trace.color == glow_eDrawTone_YellowGreen)
(glow_eDrawTone) trace.color = glow_eDrawTone_Yellow; (glow_eDrawTone) trace.color = glow_eDrawTone_Yellow;
if ( (glow_eDrawTone) trace.color2 == glow_eDrawTone_YellowGreen) if ( (glow_eDrawTone) trace.color2 == glow_eDrawTone_YellowGreen)
......
xtt/lib/xtt/src/xtt_hist.cpp
View file @ 9b56a2ac
...@@ -834,7 +834,7 @@ void Hist::get_hist_list() ...@@ -834,7 +834,7 @@ void Hist::get_hist_list()
printf(" Fel vid skapande av databashandtag avslutar\n"); printf(" Fel vid skapande av databashandtag avslutar\n");
return; return;
} }
if((ret = dataBaseP->open(dataBaseP, 0, dbName, NULL, DATABASETYPE, DB_RDONLY, 0)) != 0) if((ret = dataBaseP->open(dataBaseP, dbName, NULL, DATABASETYPE, DB_RDONLY, 0)) != 0)
{ {
/*error opening/creating db send the mess to errh, then exit*/ /*error opening/creating db send the mess to errh, then exit*/
printf("error db_open: %s\n", db_strerror(ret)); printf("error db_open: %s\n", db_strerror(ret));
......
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