Merge branch 'master' of git.eter:/projects/asu/uniset

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

@@ -247,13 +247,15 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
 	</xsl:if>
 	</xsl:for-each>
 
-		return ui.getValue(_sid);
+	    return ui.getValue(_sid);
 	}
 	catch(Exception&amp; ex)
 	{
 		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getState): " &lt;&lt; ex &lt;&lt; endl;
 		throw;
 	}
+	
+	return 0;
 }
 // -----------------------------------------------------------------------------
 void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )

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

@@ -213,7 +213,7 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
 		}
 </xsl:for-each>
 
-		return ui.getValue(_sid);
+	    return ui.getValue(_sid);
 	}
 	catch(Exception&amp; ex)
 	{

conf/libuniset.spec

@@ -8,7 +8,7 @@
 
 Name: libuniset
 Version: 1.7
-Release: alt11
+Release: alt12
 
 Summary: UniSet - library for building distributed industrial control systems
 
@@ -335,10 +335,13 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
-* Thu Apr 24 2014 Pavel Vainerman <pv@altlinux.ru> 1.7-alt11
+* Thu Apr 24 2014 Pavel Vainerman <pv@altlinux.ru> 1.7-alt12
 - remove deprecated Extensions:getHeartBeatTime(). Use conf->getHeartBeatTime()
 - rename parameter:  "time_msec" --> "msec" for <HeartBeatTime msec=""/>
 
+* Thu Apr 24 2014 Pavel Vainerman <pv@server> 1.7-alt11
+- minor fixes IOControl::setValue
+
 * Tue Apr 01 2014 Pavel Vainerman <pv@altlinux.ru> 1.7-alt10
 - add new vtype:  F2r, I2r, U2r  (reverse data order)
 

src/Processes/IOController.cc

@@ -469,8 +469,16 @@ void IOController::setValue( const IOController_i::SensorInfo& si, CORBA::Long v
 	if( sup_id == UniSetTypes::DefaultObjectId )
 		sup_id = getId();
 
-	IOController::AIOStateList::iterator li(aioList.end());
-	localSetValue(li,si,value,sup_id);
+	try
+	{
+		IOController::AIOStateList::iterator li(aioList.end());
+		localSetValue(li,si,value,sup_id);
+	} // getValue if not found...
+	catch( IOController_i::NameNotFound )
+	{
+		IOController::DIOStateList::iterator li(dioList.end());
+		localSetState(li, si, (value ? true : false), sup_id);
+	}
 }
 
 void IOController::fastSetValue( const IOController_i::SensorInfo& si, CORBA::Long value, UniSetTypes::ObjectId sup_id )