(python): Исправил ошибку, для корректной работы импорта "from uniset import *"

conf/test.xml

@@ -14,7 +14,7 @@
 		<AutoStartUpTime name="1"/>
 		<DumpStateTime name="10"/>
 		<SleepTickMS name="500"/>
-		<UniSetDebug levels="crit,warn" name="unideb"/>
+		<UniSetDebug levels="crit,warn" name="ulog"/>
 		<ConfDir name="./"/>
 		<DataDir name="./"/>
 		<BinDir name="./"/>

extensions/IOControl/IOControl.cc

@@ -1304,7 +1304,7 @@ void IOControl::sysCommand( SystemMessage* sm )
             if( !fname.empty() )
             {
                 ulog.logFile(fname);
-                ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << endl;
+                ulog << myname << "(sysCommand): ***************** ulog LOG ROTATE *****************" << endl;
             }
 
             dlog << myname << "(sysCommand): logRotate" << endl;

extensions/LogicProcessor/PassiveLProcessor.cc

@@ -154,7 +154,7 @@ void PassiveLProcessor::sysCommand( UniSetTypes::SystemMessage *sm )
             if( !fname.empty() )
             {
                 ulog.logFile(fname);
-                ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
+                ulog << myname << "(sysCommand): ***************** ulog LOG ROTATE *****************" << std::endl;
             }
 
             dlog << myname << "(sysCommand): logRotate" << std::endl;

extensions/ModbusMaster/MBExchange.cc

@@ -2642,7 +2642,7 @@ void MBExchange::sysCommand( UniSetTypes::SystemMessage *sm )
             if( !fname.empty() )
             {
                 ulog.logFile(fname);
-                ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
+                ulog << myname << "(sysCommand): ***************** ulog LOG ROTATE *****************" << std::endl;
             }
             dlog << myname << "(sysCommand): logRotate" << std::endl;
             fname = dlog.getLogFile();

extensions/ModbusSlave/MBSlave.cc

@@ -662,7 +662,7 @@ void MBSlave::sysCommand(UniSetTypes::SystemMessage *sm)
             if( !fname.empty() )
             {
                 ulog.logFile(fname);
-                ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
+                ulog << myname << "(sysCommand): ***************** ulog LOG ROTATE *****************" << std::endl;
             }
 
             dlog << myname << "(sysCommand): logRotate" << std::endl;

extensions/UNetUDP/UNetExchange.cc

@@ -596,7 +596,7 @@ void UNetExchange::sysCommand( UniSetTypes::SystemMessage *sm )
             if( !fname.empty() )
             {
                 ulog.logFile(fname);
-                ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
+                ulog << myname << "(sysCommand): ***************** ulog LOG ROTATE *****************" << std::endl;
             }
 
             dlog << myname << "(sysCommand): logRotate" << std::endl;

python/lib/UInterface.py

@@ -3,7 +3,7 @@
 
 import sys
 
-from pyUExceptions import *
+from pyUniSet import *
 from pyUConnector import *
 from pyUModbus import *
 from UGlobal import *

python/lib/__init__.py

 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__all__=["UInterface","UGlobal","UniXML","pyUInterface","pyUniSet","pyUModbus","pyUConnector","pyUExceptions"]
+from UGlobal import *
+from UniXML import *
+from UInterface import *
 
-#from UInterface import *
-#from UGlobal import *
-#from UniXML import *
-
-#from pyUInterface import *
-#from pyUniSet import *
-#from pyUModbus import *
-#from pyUConnector import *
-#from pyUExceptions import *
+from pyUniSet import *
+from pyUModbus import *
+from pyUConnector import *

python/tests/UConnector/testUC.py

@@ -3,9 +3,11 @@
 
 import sys
 
-#sys.path.append('../lib/')
+sys.path.append('../../')
+sys.path.append('../../lib/pyUniSet/')
+sys.path.append('../../lib/pyUniSet/.libs')
 
-from uniset import *
+from lib import *
 
 if __name__ == "__main__":
 	

python/tests/UInterface/testUI.py

@@ -3,11 +3,11 @@
 
 import sys
 
-sys.path.append('./.libs/')
-sys.path.append('../../lib/pyUniSet/.libs/')
+sys.path.append('../../')
 sys.path.append('../../lib/pyUniSet/')
+sys.path.append('../../lib/pyUniSet/.libs')
 
-from pyUniSet import *
+from lib import *
 
 if __name__ == "__main__":
 	

python/tests/UModbus/testUModbus.py

@@ -3,11 +3,11 @@
 
 import sys
 
-sys.path.append('./.libs/')
-sys.path.append('../../lib/pyUniSet/.libs/')
+sys.path.append('../../')
 sys.path.append('../../lib/pyUniSet/')
+sys.path.append('../../lib/pyUniSet/.libs')
 
-from pyUModbus import *
+from lib import *
 
 if __name__ == "__main__":
 

src/ObjectRepository/UniSetActivator.cc

@@ -380,7 +380,7 @@ void UniSetActivator::sysCommand( UniSetTypes::SystemMessage *sm )
             if( !fname.empty() )
             {
                 ulog.logFile(fname.c_str());
-                ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << endl;
+                ulog << myname << "(sysCommand): ***************** ulog LOG ROTATE *****************" << endl;
             }
         }
         break;

src/Various/Configuration.cc

@@ -68,7 +68,7 @@ ostream& UniSetTypes::Configuration::help(ostream& os)
     print_help(os,25,"--transientIOR {1,0}","использовать генерируемые IOR(не постоянные). Переопределяет параметр в конфигурационном файле. Default=1\n");
     
     return os << "\nПример использования:\t myUniSetProgram "
-              << "--ulog.dd-levels level1,info,system,warn --ulog.og-in-file myprogrpam.log\n\n";
+              << "--ulog-add-levels level1,info,system,warn --ulog-log-in-file myprogrpam.log\n\n";
 }
 // -------------------------------------------------------------------------