(RRDServer): исправлена ошибка с обработкой "длинных имён" датчиков

conf/libuniset2.spec

@@ -13,7 +13,7 @@
 
 Name: libuniset2
 Version: 2.2
-Release: alt19
+Release: alt20
 
 Summary: UniSet - library for building distributed industrial control systems
 
@@ -451,6 +451,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 # ..
 
 %changelog
+* Sat Feb 06 2016 Pavel Vainerman <pv@altlinux.ru> 2.2-alt20
+- RRDServer: fixed bug for long name processing.. 
+
 * Mon Jan 18 2016 Pavel Vainerman <pv@altlinux.ru> 2.2-alt19
 - rebuild new version 
 

extensions/RRDServer/RRDServer.cc

@@ -173,12 +173,12 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
 			nm << "DS:" << dsname << ":" << a;
 			dslist.push_back(nm.str());
 
-			ObjectId sid = conf->getSensorID( dsname );
+			ObjectId sid = conf->getSensorID( it1.getProp("name") );
 
 			if( sid == DefaultObjectId )
 			{
 				ostringstream err;
-				err << myname << "(init): Unknown SensorID for '" << dsname << "'";
+				err << myname << "(init): Unknown SensorID for '" << it1.getProp("name") << "'";
 				mycrit << err.str();
 				throw SystemError(err.str());
 			}

extensions/RRDServer/RRDServer.h

@@ -52,7 +52,7 @@
         <item id="54" iotype="AI" name="AI54_S" textname="AI sensor 54" rrd="1" rrd1_ds="GAUGE:20:U:U"/>
         <item id="55" iotype="AI" name="AI55_S" textname="AI sensor 55" rrd="1" rrd1_ds="GAUGE:20:U:U"/>
         <item id="56" iotype="AI" name="AI56_S" textname="AI sensor 56" rrd="2" rrd2_ds="COUNTER:20:U:U"/>
-		<item id="57" iotype="AI" name="AI57_S" rrd2_dsname='A57MyRRDName' textname="AI sensor 57" rrd="2" rrd2_ds="DERIVE:20:U:U"/>
+		<item id="57" iotype="AI" name="AI57_S" rrd2_ds_dsname='A57MyRRDName' textname="AI sensor 57" rrd="2" rrd2_ds="DERIVE:20:U:U"/>
         ...
     </sensors>
 \endcode