Skip to content

U
uniset2
Commit 818ffc50 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

Переименовал uniset.. uniset2 в скриптах

parent 9fa0dc44
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 70 deletions
Utilities/NullController/start_fg.sh
View file @ 818ffc50
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
ulimit -Sc 1000000 ulimit -Sc 1000000
uniset-start.sh -f ./uniset-nullController --name SharedMemory1 --confile test.xml --ulog-add-levels any uniset2-start.sh -f ./uniset2-nullController --name SharedMemory1 --confile test.xml --ulog-add-levels any
#info,warn,crit,system,level9 > 1.log #info,warn,crit,system,level9 > 1.log
#--c-filter-field cfilter --c-filter-value test1 --s-filter-field io --s-filter-value 1 #--c-filter-field cfilter --c-filter-value test1 --s-filter-field io --s-filter-value 1
Utilities/SImitator/start_fg.sh
View file @ 818ffc50
...@@ -4,7 +4,7 @@ ulimit -Sc 1000000 ...@@ -4,7 +4,7 @@ ulimit -Sc 1000000
#for i in `seq 1 20`; #for i in `seq 1 20`;
#do #do
uniset-start.sh -f ./uniset-simitator --confile test.xml --sid $* uniset2-start.sh -f ./uniset2-simitator --confile test.xml --sid $*
#done #done
#wait #wait
......
Utilities/SMonit/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-smonit --name TestProc --confile test.xml --sid $* uniset2-start.sh -f ./uniset2-smonit --name TestProc --confile test.xml --sid $*
#--ulog-add-levels system,info,level9 $* #--ulog-add-levels system,info,level9 $*
Utilities/SViewer-text/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
#while true; do #while true; do
uniset-start.sh -f ./uniset-sviewer-text --confile test.xml --ulog-add-levels warn,crit uniset2-start.sh -f ./uniset2-sviewer-text --confile test.xml --ulog-add-levels warn,crit
#done #done
Utilities/codegen/tests/create_links.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ln -s -f /usr/bin/uniset-stop.sh stop.sh ln -s -f /usr/bin/uniset2-stop.sh stop.sh
ln -s -f ../../../conf/test.xml test.xml ln -s -f ../../../conf/test.xml test.xml
Utilities/codegen/tests/start_fg.sh
View file @ 818ffc50
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
ulimit -Sc 1000000 ulimit -Sc 1000000
uniset-start.sh -f ./test --name TestProc --confile test.xml --ulog-add-levels info,crit,warn,level1,level8 \ uniset2-start.sh -f ./test --name TestProc --confile test.xml --ulog-add-levels info,crit,warn,level1,level8 \
--sm-ready-timeout 5000 --sm-ready-timeout 5000
#info,warn,crit,system,level9 > 1.log #info,warn,crit,system,level9 > 1.log
#--c-filter-field cfilter --c-filter-value test1 --s-filter-field io --s-filter-value 1 #--c-filter-field cfilter --c-filter-value test1 --s-filter-field io --s-filter-value 1
......
Utilities/codegen/uniset2-codegen.in
View file @ 818ffc50
...@@ -9,7 +9,7 @@ sysconfdir=@sysconfdir@ ...@@ -9,7 +9,7 @@ sysconfdir=@sysconfdir@
top_builddir=@top_builddir@ top_builddir=@top_builddir@
xsltdir=@datadir@/uniset/xslt xsltdir=@datadir@/@PACKAGE@/xslt
PROG="${0##*/}" PROG="${0##*/}"
......
Utilities/scripts/uniset2-functions.sh
View file @ 818ffc50
...@@ -134,4 +134,4 @@ function runOmniNames() ...@@ -134,4 +134,4 @@ function runOmniNames()
fi fi
return $RETVAL return $RETVAL
} }
\ No newline at end of file
Utilities/scripts/uniset2-start.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
# общие функции # общие функции
. uniset-functions.sh . uniset2-functions.sh
WITH_PID=0 WITH_PID=0
std=0 std=0
......
Utilities/scripts/uniset2-stop.sh
View file @ 818ffc50
...@@ -5,7 +5,7 @@ ARGS=$1 ...@@ -5,7 +5,7 @@ ARGS=$1
# внимание при сборке пакета эта строка меняется, # внимание при сборке пакета эта строка меняется,
# поэтому лучше её не трогать :) (см. makefile :install) # поэтому лучше её не трогать :) (см. makefile :install)
. uniset-functions.sh . uniset2-functions.sh
std=0 std=0
standart_control $std standart_control $std
......
conf/libuniset2.spec
View file @ 818ffc50
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Name: libuniset2 Name: libuniset2
Version: 2.0 Version: 2.0
Release: alt0.4 Release: alt0.5
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
...@@ -333,6 +333,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname ...@@ -333,6 +333,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%exclude %_pkgconfigdir/libUniSet2.pc %exclude %_pkgconfigdir/libUniSet2.pc
%changelog %changelog
* Fri Jan 31 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt0.5
- minor fixes
- test build
* Fri Jan 31 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt0.4 * Fri Jan 31 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt0.4
- rename uniset --> uniset2 - rename uniset --> uniset2
......
extensions/DBServer-MySQL/create_links.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ln -s -f /usr/bin/uniset-stop.sh stop.sh ln -s -f /usr/bin/uniset2-stop.sh stop.sh
ln -s -f ../../conf/test.xml test.xml ln -s -f ../../conf/test.xml test.xml
extensions/DBServer-MySQL/start_fg.sh
View file @ 818ffc50
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
ulimit -Sc 1000000 ulimit -Sc 1000000
uniset-start.sh -f ./uniset-mysql-dbserver --confile test.xml --name DBServer1 \ uniset2-start.sh -f ./uniset2-mysql-dbserver --confile test.xml --name DBServer1 \
--ulog-add-levels info,crit,warn,level9,system \ --ulog-add-levels info,crit,warn,level9,system \
--dbserver-buffer-size 100 --dbserver-buffer-size 100
extensions/DBServer-SQLite/start_fg.sh
View file @ 818ffc50
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
ulimit -Sc 1000000 ulimit -Sc 1000000
uniset-start.sh -f ./uniset-sqlite-dbserver --confile test.xml --name DBServer1 \ uniset2-start.sh -f ./uniset2-sqlite-dbserver --confile test.xml --name DBServer1 \
--ulog-add-levels info,crit,warn,level9,system \ --ulog-add-levels info,crit,warn,level9,system \
--dbserver-buffer-size 100 --dbserver-buffer-size 100
extensions/IOControl/create_links.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ln -s -f ../../Utilities/scripts/uniset-start.sh ln -s -f ../../Utilities/scripts/uniset2-start.sh
ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh ln -s -f ../../Utilities/scripts/uniset2-stop.sh stop.sh
ln -s -f ../../Utilities/scripts/uniset-functions.sh ln -s -f ../../Utilities/scripts/uniset2-functions.sh
ln -s -f ../../conf/test.xml test.xml ln -s -f ../../conf/test.xml test.xml
extensions/IOControl/start_fg.sh
View file @ 818ffc50
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs" export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs"
#ulimit -Sc 1000000000000 #ulimit -Sc 1000000000000
uniset-start.sh -f ./uniset-iocontrol --smemory-id SharedMemory \ uniset2-start.sh -f ./uniset2-iocontrol --smemory-id SharedMemory \
--confile test.xml \ --confile test.xml \
--io-name IOControl \ --io-name IOControl \
--io-polltime 100 \ --io-polltime 100 \
......
extensions/LogicProcessor/create_links.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ln -s -f ../../Utilities/scripts/uniset-start.sh ln -s -f ../../Utilities/scripts/uniset2-start.sh
ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh ln -s -f ../../Utilities/scripts/uniset2-stop.sh stop.sh
ln -s -f ../../Utilities/scripts/uniset-functions.sh ln -s -f ../../Utilities/scripts/uniset2-functions.sh
ln -s -f ../../conf/test.xml test.xml ln -s -f ../../conf/test.xml test.xml
extensions/LogicProcessor/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-logicproc --confile test.xml --schema schema.xml --ulog-add-levels any --dlog-add-levels any uniset2-start.sh -f ./uniset2-logicproc --confile test.xml --schema schema.xml --ulog-add-levels any --dlog-add-levels any
extensions/LogicProcessor/start_fg_plogic.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-plogicproc --schema schema.xml \ uniset2-start.sh -f ./uniset2-plogicproc --schema schema.xml \
--smemory-id SharedMemory --name LProcessor \ --smemory-id SharedMemory --name LProcessor \
--confile test.xml --ulog-add-levels info,crit,warn,level9,system --confile test.xml --ulog-add-levels info,crit,warn,level9,system
extensions/ModbusMaster/start_fg_mbrtu.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-rtuexchange --confile test.xml \ uniset2-start.sh -f ./uniset2-rtuexchange --confile test.xml \
--smemory-id SharedMemory \ --smemory-id SharedMemory \
--rs-dev /dev/cbsideA0 \ --rs-dev /dev/cbsideA0 \
--rs-name RTUExchange \ --rs-name RTUExchange \
......
extensions/ModbusMaster/start_fg_mbtcp.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
./uniset-start.sh -f ./uniset-mbtcpmaster \ ./uniset2-start.sh -f ./uniset2-mbtcpmaster \
--confile test.xml \ --confile test.xml \
--mbtcp-name MBMaster1 \ --mbtcp-name MBMaster1 \
--smemory-id SharedMemory \ --smemory-id SharedMemory \
......
extensions/ModbusMaster/start_fg_mbtcpmulti.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
./uniset-start.sh -f ./uniset-mbtcpmultimaster \ ./uniset2-start.sh -f ./uniset2-mbtcpmultimaster \
--confile test.xml \ --confile test.xml \
--mbtcp-name MBMultiMaster1 \ --mbtcp-name MBMultiMaster1 \
--smemory-id SharedMemory \ --smemory-id SharedMemory \
......
extensions/ModbusSlave/create_links.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ln -s -f ../../Utilities/scripts/uniset-start.sh ln -s -f ../../Utilities/scripts/uniset2-start.sh
ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh ln -s -f ../../Utilities/scripts/uniset2-stop.sh stop.sh
ln -s -f ../../Utilities/scripts/uniset-functions.sh ln -s -f ../../Utilities/scripts/uniset2-functions.sh
ln -s -f ../../conf/test.xml test.xml ln -s -f ../../conf/test.xml test.xml
extensions/ModbusSlave/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-mbslave --mbs-name MBSlave1 --confile test.xml --dlog-add-levels info,crit,warn \ uniset2-start.sh -f ./uniset2-mbslave --mbs-name MBSlave1 --confile test.xml --dlog-add-levels info,crit,warn \
--mbs-type RTU --mbs-dev /dev/cbsideA0 --mbs-reg-from-id 1 --mbs-type RTU --mbs-dev /dev/cbsideA0 --mbs-reg-from-id 1
# --mbs-type TCP --mbs-inet-addr 127.0.0.2 --mbs-inet-port 2048 # --mbs-type TCP --mbs-inet-addr 127.0.0.2 --mbs-inet-port 2048
\ No newline at end of file
extensions/ModbusSlave/start_tcp2_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-mbslave --confile test.xml --dlog-add-levels info,crit,warn \ uniset2-start.sh -f ./uniset2-mbslave --confile test.xml --dlog-add-levels info,crit,warn \
--mbs-name MBSlave1 \ --mbs-name MBSlave1 \
--mbs-type TCP --mbs-inet-addr 127.0.0.1 --mbs-inet-port 2048 --mbs-my-addr 0x01 \ --mbs-type TCP --mbs-inet-addr 127.0.0.1 --mbs-inet-port 2048 --mbs-my-addr 0x01 \
--mbs-askcount-id SVU_AskCount_AS \ --mbs-askcount-id SVU_AskCount_AS \
......
extensions/ModbusSlave/start_tcp_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-mbslave --confile test.xml --dlog-add-levels any \ uniset2-start.sh -f ./uniset2-mbslave --confile test.xml --dlog-add-levels any \
--smemory-id SharedMemory \ --smemory-id SharedMemory \
--mbs-name MBSlave1 \ --mbs-name MBSlave1 \
--mbs-type TCP --mbs-inet-addr 127.0.0.1 --mbs-inet-port 2048 --mbs-reg-from-id 1 --mbs-my-addr 0x01 \ --mbs-type TCP --mbs-inet-addr 127.0.0.1 --mbs-inet-port 2048 --mbs-reg-from-id 1 --mbs-my-addr 0x01 \
......
extensions/ModbusSlave/start_tcp_fg2.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-mbslave --confile test.xml --dlog-add-levels info,crit,warn \ uniset2-start.sh -f ./uniset2-mbslave --confile test.xml --dlog-add-levels info,crit,warn \
--smemory-id SharedMemory \ --smemory-id SharedMemory \
--mbs-name MBSlave2 --mbs-type TCP --mbs-inet-addr localhost --mbs-inet-port 2050 --mbs-reg-from-id 1 --mbs-my-addr 0x01 \ --mbs-name MBSlave2 --mbs-type TCP --mbs-inet-addr localhost --mbs-inet-port 2050 --mbs-reg-from-id 1 --mbs-my-addr 0x01 \
......
extensions/RRDServer/create_links.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ln -s -f ../../Utilities/scripts/uniset-start.sh ln -s -f ../../Utilities/scripts/uniset2-start.sh
ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh ln -s -f ../../Utilities/scripts/uniset2-stop.sh stop.sh
ln -s -f ../../Utilities/scripts/uniset-functions.sh ln -s -f ../../Utilities/scripts/uniset2-functions.sh
ln -s -f ../../conf/test.xml test.xml ln -s -f ../../conf/test.xml test.xml
extensions/RRDServer/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-rrdserver --confile test.xml \ uniset2-start.sh -f ./uniset2-rrdserver --confile test.xml \
--rrd-name RRDServer1 \ --rrd-name RRDServer1 \
--dlog-add-levels info,crit,warn --dlog-add-levels info,crit,warn
extensions/SMDBServer/create_links.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ln -s -f ../../Utilities/scripts/uniset-start.sh ln -s -f ../../Utilities/scripts/uniset2-start.sh
ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh ln -s -f ../../Utilities/scripts/uniset2-stop.sh stop.sh
ln -s -f ../../Utilities/scripts/uniset-functions.sh ln -s -f ../../Utilities/scripts/uniset2-functions.sh
ln -s -f ../../conf/test.xml test.xml ln -s -f ../../conf/test.xml test.xml
extensions/SMDBServer/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-smdbserver --confile test.xml \ uniset2-start.sh -f ./uniset2-smdbserver --confile test.xml \
--dbserver-name DBServer \ --dbserver-name DBServer \
--dlog-add-levels info,crit,warn --dlog-add-levels info,crit,warn
extensions/SharedMemory/create_links.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ln -s -f ../../Utilities/scripts/uniset-start.sh ln -s -f ../../Utilities/scripts/uniset2-start.sh
ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh ln -s -f ../../Utilities/scripts/uniset2-stop.sh stop.sh
ln -s -f ../../Utilities/scripts/uniset-functions.sh ln -s -f ../../Utilities/scripts/uniset2-functions.sh
ln -s -f ../../conf/test.xml test.xml ln -s -f ../../conf/test.xml test.xml
extensions/SharedMemory/start_fg.sh
View file @ 818ffc50
...@@ -4,7 +4,7 @@ export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs" ...@@ -4,7 +4,7 @@ export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs"
ulimit -Sc 10000000000 ulimit -Sc 10000000000
./uniset-start.sh -f ./uniset-smemory --smemory-id SharedMemory --pulsar-id DO_C --pulsar-iotype DO \ ./uniset2-start.sh -f ./uniset2-smemory --smemory-id SharedMemory --pulsar-id DO_C --pulsar-iotype DO \
--confile test.xml --datfile test.xml \ --confile test.xml --datfile test.xml \
--ulog-add-levels info,crit,warn,level9,system \ --ulog-add-levels info,crit,warn,level9,system \
--dlog-add-levels info,crit,warn \ --dlog-add-levels info,crit,warn \
......
extensions/SharedMemoryPlus/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ulimit -Sc 10000000 ulimit -Sc 10000000
START=uniset-start.sh START=uniset2-start.sh
${START} -f ./uniset-smemory-plus --smemory-id SharedMemory --confile test.xml \ ${START} -f ./uniset2-smemory-plus --smemory-id SharedMemory --confile test.xml \
--dlog-add-levels any \ --dlog-add-levels any \
--io-name IOControl \ --io-name IOControl \
--io-polltime 100 \ --io-polltime 100 \
......
extensions/UNetUDP/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-unetexchange --unet-name UNetExchange \ uniset2-start.sh -f ./uniset2-unetexchange --unet-name UNetExchange \
--confile test.xml --smemory-id SharedMemory \ --confile test.xml --smemory-id SharedMemory \
--unet-filter-field rs --unet-filter-value 2 --unet-maxdifferense 40 \ --unet-filter-field rs --unet-filter-value 2 --unet-maxdifferense 40 \
--dlog-add-levels info,crit,warn --dlog-add-levels info,crit,warn
extensions/UniNetwork/create_links.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
ln -s -f ../../Utilities/scripts/uniset-start.sh ln -s -f ../../Utilities/scripts/uniset2-start.sh
ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh ln -s -f ../../Utilities/scripts/uniset2-stop.sh stop.sh
ln -s -f ../../Utilities/scripts/uniset-functions.sh ln -s -f ../../Utilities/scripts/uniset2-functions.sh
ln -s -f ../../conf/test.xml test.xml ln -s -f ../../conf/test.xml test.xml
extensions/UniNetwork/start_fg.sh
View file @ 818ffc50
...@@ -4,7 +4,7 @@ export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs" ...@@ -4,7 +4,7 @@ export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs"
ulimit -Sc 10000000000 ulimit -Sc 10000000000
./uniset-start.sh -f ./uniset-network --confile test.xml \ ./uniset2-start.sh -f ./uniset2-network --confile test.xml \
--smemory-id SharedMemory \ --smemory-id SharedMemory \
--unet-id UniExchange --unet-id UniExchange
extensions/tests/SMemoryTest/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
START=uniset-start.sh START=uniset2-start.sh
${START} -f ./smemory-test --confile test.xml --dlog-add-levels level1 --localNode LocalhostNode $* ${START} -f ./smemory-test --confile test.xml --dlog-add-levels level1 --localNode LocalhostNode $*
......
extensions/tests/SMemoryTest/start_fg_vcall.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
START=uniset-start.sh START=uniset2-start.sh
${START} -vcall ./.libs/lt-smemory-test --confile ./test.xml --dlog-add-levels level1 --localNode LocalhostNode $* ${START} -vcall ./.libs/lt-smemory-test --confile ./test.xml --dlog-add-levels level1 --localNode LocalhostNode $*
......
python/examples/start_fg_UC.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
START=uniset-start.sh START=uniset2-start.sh
${START} -f ./testUC.py --ulog-add-levels info,warn,crit ${START} -f ./testUC.py --ulog-add-levels info,warn,crit
python/lib/__init__.py
View file @ 818ffc50
...@@ -5,6 +5,6 @@ from UGlobal import * ...@@ -5,6 +5,6 @@ from UGlobal import *
from UniXML import * from UniXML import *
from UInterface import * from UInterface import *
from pyUniSet2 import * from pyUniSet import *
from pyUModbus import * from pyUModbus import *
from pyUConnector import * from pyUConnector import *
python/lib/pyUniSet/PyUInterface.cc
View file @ 818ffc50
...@@ -38,7 +38,7 @@ long pyUInterface::getValue( long id )throw(UException) ...@@ -38,7 +38,7 @@ long pyUInterface::getValue( long id )throw(UException)
{ {
if( !UniSetTypes::conf || !ui ) if( !UniSetTypes::conf || !ui )
throw USysError(); throw USysError();
UniversalIO::IOType t = UniSetTypes::conf->getIOType(id); UniversalIO::IOType t = UniSetTypes::conf->getIOType(id);
try try
{ {
...@@ -50,7 +50,7 @@ long pyUInterface::getValue( long id )throw(UException) ...@@ -50,7 +50,7 @@ long pyUInterface::getValue( long id )throw(UException)
case UniversalIO::AO: case UniversalIO::AO:
return ui->getValue(id); return ui->getValue(id);
break; break;
default: default:
{ {
ostringstream e; ostringstream e;
...@@ -71,7 +71,7 @@ long pyUInterface::getValue( long id )throw(UException) ...@@ -71,7 +71,7 @@ long pyUInterface::getValue( long id )throw(UException)
{ {
throw UException("(getValue): catch..."); throw UException("(getValue): catch...");
} }
throw UException("(getValue): unknown error"); throw UException("(getValue): unknown error");
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
...@@ -79,7 +79,7 @@ void pyUInterface::setValue( long id, long val )throw(UException) ...@@ -79,7 +79,7 @@ void pyUInterface::setValue( long id, long val )throw(UException)
{ {
if( !UniSetTypes::conf || !ui ) if( !UniSetTypes::conf || !ui )
throw USysError(); throw USysError();
UniversalIO::IOType t = UniSetTypes::conf->getIOType(id); UniversalIO::IOType t = UniSetTypes::conf->getIOType(id);
try try
{ {
...@@ -91,7 +91,7 @@ void pyUInterface::setValue( long id, long val )throw(UException) ...@@ -91,7 +91,7 @@ void pyUInterface::setValue( long id, long val )throw(UException)
case UniversalIO::AO: case UniversalIO::AO:
ui->setValue(id,val); ui->setValue(id,val);
break; break;
default: default:
{ {
ostringstream e; ostringstream e;
...@@ -118,15 +118,15 @@ long pyUInterface::getSensorID( const char* name ) ...@@ -118,15 +118,15 @@ long pyUInterface::getSensorID( const char* name )
{ {
if( UniSetTypes::conf ) if( UniSetTypes::conf )
return UniSetTypes::conf->getSensorID(name); return UniSetTypes::conf->getSensorID(name);
return -1; return UniSetTypes::DefaultObjectId;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
const char* pyUInterface::getName( long id ) const char* pyUInterface::getName( long id )
{ {
if( UniSetTypes::conf ) if( UniSetTypes::conf )
return UniSetTypes::conf->oind->getMapName(id).c_str(); return UniSetTypes::conf->oind->getMapName(id).c_str();
return ""; return "";
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
...@@ -134,7 +134,7 @@ const char* pyUInterface::getShortName( long id ) ...@@ -134,7 +134,7 @@ const char* pyUInterface::getShortName( long id )
{ {
if( UniSetTypes::conf ) if( UniSetTypes::conf )
return ORepHelpers::getShortName(UniSetTypes::conf->oind->getMapName(id)).c_str(); return ORepHelpers::getShortName(UniSetTypes::conf->oind->getMapName(id)).c_str();
return ""; return "";
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
...@@ -142,7 +142,7 @@ const char* pyUInterface::getTextName( long id ) ...@@ -142,7 +142,7 @@ const char* pyUInterface::getTextName( long id )
{ {
if( UniSetTypes::conf ) if( UniSetTypes::conf )
return UniSetTypes::conf->oind->getTextName(id).c_str(); return UniSetTypes::conf->oind->getTextName(id).c_str();
return ""; return "";
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
...@@ -150,7 +150,7 @@ const char* pyUInterface::getConfFileName() ...@@ -150,7 +150,7 @@ const char* pyUInterface::getConfFileName()
{ {
if( UniSetTypes::conf ) if( UniSetTypes::conf )
return UniSetTypes::conf->getConfFileName().c_str(); return UniSetTypes::conf->getConfFileName().c_str();
return ""; return "";
} }
......
python/tests/UConnector/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
START=./uniset-start.sh START=./uniset2-start.sh
export LD_LIBRARY_PATH="../../lib/.libs;../../lib/pyUniSet/.libs" export LD_LIBRARY_PATH="../../lib/.libs;../../lib/pyUniSet/.libs"
......
python/tests/UInterface/start_fg.sh
View file @ 818ffc50
#!/bin/sh #!/bin/sh
START=./uniset-start.sh START=./uniset2-start.sh
${START} -f ./testUI.py --unideb-add-levels info,warn,crit ${START} -f ./testUI.py --unideb-add-levels info,warn,crit
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