Выпуск версии 2.6

AUTHORS

 see git changelog
+
+----
+json.hpp - Niels Lohmann https://github.com/nlohmann/json

README.md

@@ -9,6 +9,8 @@ There are set of base components to construct this kind of systems:
 * logging system based on MySQL, SQLite, PostgreeSQL databases.
 * Web interface to display logging and statistic information.
 * utilities for system's configuration based on XML.
+* python interface
+* REST API
 
 UniSet have been written in C++ and IDL languages but you can use another languages in your
 add-on components. The main principle of the UniSet library's design is a maximum integration

Utilities/codegen/ctl-cpp-h-alone.xsl

@@ -52,8 +52,12 @@
 #include <xsl:call-template name="preinclude"/>VMonitor.h<xsl:call-template name="postinclude"/>
 // -----------------------------------------------------------------------------
 class <xsl:value-of select="$CLASSNAME"/>_SK:
-	<xsl:if test="normalize-space($BASECLASS)!=''">public <xsl:value-of select="normalize-space($BASECLASS)"/></xsl:if>
-	<xsl:if test="normalize-space($BASECLASS)=''">public uniset::UniSetObject</xsl:if>
+<xsl:choose>
+	<xsl:when test="normalize-space($BASECLASS)='UniSetObject'">	public uniset::UniSetObject</xsl:when>
+	<xsl:when test="normalize-space($BASECLASS)='UniSetManager'">	public uniset::UniSetManager</xsl:when>
+	<xsl:when test="normalize-space($BASECLASS)!=''">	public <xsl:value-of select="normalize-space($BASECLASS)"/></xsl:when>
+	<xsl:when test="normalize-space($BASECLASS)=''">	public uniset::UniSetObject</xsl:when>
+</xsl:choose>
 {
 	public:
 		<xsl:if test="not(normalize-space($OID))=''">

Utilities/codegen/ctl-cpp-h.xsl

@@ -51,8 +51,12 @@
 #include <xsl:call-template name="preinclude"/>VMonitor.h<xsl:call-template name="postinclude"/>
 // -----------------------------------------------------------------------------
 class <xsl:value-of select="$CLASSNAME"/>_SK:
-	<xsl:if test="normalize-space($BASECLASS)!=''">public <xsl:value-of select="normalize-space($BASECLASS)"/></xsl:if>
-	<xsl:if test="normalize-space($BASECLASS)=''">public uniset::UniSetObject</xsl:if>
+<xsl:choose>
+	<xsl:when test="normalize-space($BASECLASS)='UniSetObject'">	public uniset::UniSetObject</xsl:when>
+	<xsl:when test="normalize-space($BASECLASS)='UniSetManager'">	public uniset::UniSetManager</xsl:when>
+	<xsl:when test="normalize-space($BASECLASS)!=''">	public <xsl:value-of select="normalize-space($BASECLASS)"/></xsl:when>
+	<xsl:when test="normalize-space($BASECLASS)=''">	public uniset::UniSetObject</xsl:when>
+</xsl:choose>
 {
 	public:
 		<xsl:if test="not(normalize-space($OID))=''">

Utilities/codegen/tests/testgen.src.xml

@@ -13,6 +13,7 @@
 <Test>
   <settings>
   	<set name="class-name" val="TestGen"/>
+  	<set name="base-class" val="UniSetManager"/>
   	<set name="msg-count" val="20"/>
 	<set name="sleep-msec" val="150"/>
 	<set name="arg-prefix" val="test-"/>

conf/libuniset2.spec

@@ -14,8 +14,8 @@
 %define oname uniset2
 
 Name: libuniset2
-Version: 2.5
-Release: alt20
+Version: 2.6
+Release: alt1
 Summary: UniSet - library for building distributed industrial control systems
 
 License: LGPL
@@ -504,11 +504,14 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %exclude %_pkgconfigdir/libUniSet2.pc
         
 # history of current unpublished changes
-# - remove 'fastSaveValue'
-# - add suppor HTTP REST API
-# - (SM): add new statistics for consumers
 
 %changelog
+* Fri Nov 11 2016 Pavel Vainerman <pv@altlinux.ru> 2.6-alt1
+- build new version
+- remove 'fastSaveValue'
+- add suppor HTTP REST API
+- (SM): add new statistics for consumers
+
 * Mon Oct 24 2016 Pavel Vainerman <pv@altlinux.ru> 2.5-alt20
 - correction after verification static analyzer (part 2)
 - LogServer: fixed bug "connection refuse" (again)

configure.ac

@@ -3,10 +3,10 @@
 # See doc: http://www.gnu.org/software/hello/manual/autoconf/Generic-Programs.html
 
 # AC_PREREQ(2.59)
-AC_INIT([uniset2], [2.5.1], pv@etersoft.ru)
+AC_INIT([uniset2], [2.6.0], pv@etersoft.ru)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
-LIBVER=2:5:0
+LIBVER=2:6:0
 AC_SUBST(LIBVER)
 
 # AC_CONFIG_MACRO_DIR([m4])

extensions/include/UObject_SK.h

@@ -8,7 +8,7 @@
  ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
 */ 
 // --------------------------------------------------------------------------
-// generate timestamp: 2016-11-08+03:00
+// generate timestamp: 2016-11-11+03:00
 // -----------------------------------------------------------------------------
 #ifndef UObject_SK_H_
 #define UObject_SK_H_

extensions/lib/UObject_SK.cc

@@ -11,7 +11,7 @@
  ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
 */ 
 // --------------------------------------------------------------------------
-// generate timestamp: 2016-11-08+03:00
+// generate timestamp: 2016-11-11+03:00
 // -----------------------------------------------------------------------------
 #include <memory>
 #include <iomanip>

python/tests/UConnector/testUC.py

@@ -9,8 +9,23 @@ sys.path.append('../../lib/pyUniSet/.libs')
 
 from lib import *
 
+def myfunc( act ):
+	act['test'] = 'test'
+	act['result'] = True
+	return True
+
+
 if __name__ == "__main__":
 	
+	
+	act = dict()
+	act['type'] = 'type'
+	myfunc(act)
+	
+	print act
+	exit(0)
+	
+	
 	lst = Params_inst()
 	lst2 = Params_inst()