Merge branch 'master' of git.set:packages/uniset2

Utilities/codegen/ctl-cpp-cc-alone-ask.xsl

@@ -181,7 +181,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
 	<xsl:if test="normalize-space(@vartype)='out'">
 	if( _sid == <xsl:value-of select="../../@name"/> )
 	{
-        ulog2 &lt;&lt;  "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; _val &lt;&lt;  endl;
+        mylog8 &lt;&lt;  "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; _val &lt;&lt;  endl;
 		<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>	= _val;
 		<xsl:call-template name="setdata"/>
 		return;

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

@@ -154,7 +154,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
 	<xsl:if test="normalize-space(@vartype)='out'">
 	if( _sid == <xsl:value-of select="../../@name"/> )
 	{
-        ulog2 &lt;&lt;  "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt;  _val &lt;&lt;  endl;
+        mylog8 &lt;&lt;  "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt;  _val &lt;&lt;  endl;
 		<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>	= _val;
 		return;
 	}

Utilities/codegen/ctl-cpp-cc-ask.xsl

@@ -112,7 +112,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
 		<xsl:if test="normalize-space(@vartype)='out'">
 		if( _sid == <xsl:value-of select="@name"/> )
 		{
-            ulog2 &lt;&lt;  "(setState): <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = " &lt;&lt;  _val &lt;&lt;  endl;
+            mylog8 &lt;&lt;  "(setState): <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = " &lt;&lt;  _val &lt;&lt;  endl;
 			<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>	= _val;
 				<xsl:call-template name="setdata"/>
 			return;

Utilities/codegen/ctl-cpp-cc.xsl

@@ -116,7 +116,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId sid
 		<xsl:if test="normalize-space(@vartype)='out'">
 		if( sid == <xsl:value-of select="@name"/> )
 		{
-            ulog2 &lt;&lt;  "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = " &lt;&lt;  val &lt;&lt;  endl;
+            mylog8 &lt;&lt;  "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = " &lt;&lt;  val &lt;&lt;  endl;
 			<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>	= val;
 			return;
 		}

conf/libuniset2.spec

@@ -12,7 +12,7 @@
 
 Name: libuniset2
 Version: 2.0
-Release: alt18
+Release: alt19
 
 Summary: UniSet - library for building distributed industrial control systems
 
@@ -409,6 +409,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 # ..
 
 %changelog
+* Fri Mar 06 2015 Pavel Vainerman <pv@altlinux.ru> 2.0-alt19
+- codegen: fixed bug (in previous commit)
+- codegen: fixed warning (redefined mylog macroses)
+
 * Sat Feb 28 2015 Pavel Vainerman <pv@altlinux.ru> 2.0-alt18
 - codegen: set default argprefix=myname (object name)
 - codegen: fixed minor bug in mylog..

extensions/include/UObject_SK.h

@@ -8,7 +8,7 @@
  ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
 */ 
 // --------------------------------------------------------------------------
-// generate timestamp: 2015-02-28+03:00
+// generate timestamp: 2015-03-06+03:00
 // -----------------------------------------------------------------------------
 #ifndef UObject_SK_H_
 #define UObject_SK_H_
@@ -42,19 +42,45 @@ class UObject_SK:
 		void init_dlog( std::shared_ptr<DebugStream> d );
 
         // "синтаксический сахар"..для логов
+        #ifndef myinfo 
         	#define myinfo if( mylog->debugging(Debug::INFO) ) mylog->info() 
+        #endif
+        #ifndef mywarn
 	        #define mywarn if( mylog->debugging(Debug::WARN) ) mylog->warn()
+        #endif
+        #ifndef mycrit
     	    #define mycrit if( mylog->debugging(Debug::CRIT) ) mylog->crit()
+        #endif
+        #ifndef mylog1
         	#define mylog1 if( mylog->debugging(Debug::LEVEL1) ) mylog->level1()
+        #endif
+        #ifndef mylog2
 	        #define mylog2 if( mylog->debugging(Debug::LEVEL2) ) mylog->level2()
+        #endif
+        #ifndef mylog3
     	    #define mylog3 if( mylog->debugging(Debug::LEVEL3) ) mylog->level3()
+        #endif
+        #ifndef mylog4
         	#define mylog4 if( mylog->debugging(Debug::LEVEL4) ) mylog->level4()
+        #endif
+        #ifndef mylog5
 	        #define mylog5 if( mylog->debugging(Debug::LEVEL5) ) mylog->level5()
+        #endif
+        #ifndef mylog6
     	    #define mylog6 if( mylog->debugging(Debug::LEVEL6) ) mylog->level6()
+        #endif
+        #ifndef mylog7
         	#define mylog7 if( mylog->debugging(Debug::LEVEL7) ) mylog->level7()
+        #endif
+        #ifndef mylog8
 	        #define mylog8 if( mylog->debugging(Debug::LEVEL8) ) mylog->level8()
+        #endif
+        #ifndef mylog9
     	    #define mylog9 if( mylog->debugging(Debug::LEVEL9) ) mylog->level9()
+        #endif
+        #ifndef mylogany
         	#define mylogany mylog->any()
+        #endif
 
 
 		// Используемые идентификаторы

extensions/lib/UObject_SK.cc

@@ -11,7 +11,7 @@
  ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
 */ 
 // --------------------------------------------------------------------------
-// generate timestamp: 2015-02-28+03:00
+// generate timestamp: 2015-03-06+03:00
 // -----------------------------------------------------------------------------
 #include <memory>
 #include "Configuration.h"
@@ -62,7 +62,7 @@ static const std::string init3_str( const std::string& s1, const std::string& s2
 // -----------------------------------------------------------------------------
 UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argprefix ):
 UniSetObject(id),
-argprefix( (_argprefix.empty() ? myname+"-" : argprefix) ),
+argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
 // Инициализация идентификаторов (имена берутся из конф. файла)
 
 // Используемые идентификаторы сообщений (имена берутся из конф. файла)
@@ -103,7 +103,7 @@ end_private(false)
 	mylog->setLogName(myname);
 	{
 		ostringstream s;
-		s << argprefix << "-log";
+		s << argprefix << "log";
 		conf->initLogStream(mylog,s.str());
 	}
 
@@ -186,17 +186,17 @@ bool UObject_SK::alarm( UniSetTypes::ObjectId _code, bool _state )
 {
 	if( _code == UniSetTypes::DefaultObjectId )
 	{
-        ucrit  << getName()
+        mycrit  << getName()
 				<< "(alarm): попытка послать сообщение с DefaultObjectId"
 				<< endl;
 		return false;	
 	}
 
-    ulog1 << getName()  << "(alarm): " << ( _state ? "SEND " : "RESET " ) << endl;
+    mylog8 << getName()  << "(alarm): " << ( _state ? "SEND " : "RESET " ) << endl;
 	
 	
 	
-    ulog1 << " not found MessgeOID?!!" << endl;
+    mylog8 << " not found MessgeOID?!!" << endl;
 	return false;
 }
 // -----------------------------------------------------------------------------