Commit 8a8ff157 authored by Pavel Vainerman's avatar Pavel Vainerman

(codegen): сделал вылавливание исключений при работе с датчиками (для вывода в…

(codegen): сделал вылавливание исключений при работе с датчиками (для вывода в лог... и повторного throw...)
parent 526c1462
...@@ -233,6 +233,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code ...@@ -233,6 +233,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
<xsl:template name="getdata"> <xsl:template name="getdata">
<xsl:param name="output">0</xsl:param> <xsl:param name="output">0</xsl:param>
try
{
<xsl:if test="normalize-space(../../@msg)!='1'"> <xsl:if test="normalize-space(../../@msg)!='1'">
<xsl:if test="normalize-space(@name)=$OID"> <xsl:if test="normalize-space(@name)=$OID">
<xsl:choose> <xsl:choose>
...@@ -253,6 +255,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code ...@@ -253,6 +255,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
</xsl:choose> </xsl:choose>
</xsl:if> </xsl:if>
</xsl:if> </xsl:if>
}
catch( Exception&amp; ex )
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
throw ex;
}
</xsl:template> </xsl:template>
<xsl:template name="setdata"> <xsl:template name="setdata">
...@@ -279,6 +287,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code ...@@ -279,6 +287,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
</xsl:template> </xsl:template>
<xsl:template name="gensetdata"> <xsl:template name="gensetdata">
try
{
<xsl:choose> <xsl:choose>
<xsl:when test="normalize-space(../../@iotype)='DO'"> <xsl:when test="normalize-space(../../@iotype)='DO'">
ui.setState( <xsl:value-of select="../../@name"/>, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> ); ui.setState( <xsl:value-of select="../../@name"/>, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> );
...@@ -297,10 +307,18 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code ...@@ -297,10 +307,18 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
ui.saveValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::AnalogInput, getId() ); ui.saveValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::AnalogInput, getId() );
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
}
catch( Exception&amp; ex )
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw ex;
}
</xsl:template> </xsl:template>
<xsl:template name="setdata_val"> <xsl:template name="setdata_val">
<xsl:param name="setval"></xsl:param> <xsl:param name="setval"></xsl:param>
try
{
<xsl:choose> <xsl:choose>
<xsl:when test="normalize-space(../../@iotype)='DO'"> <xsl:when test="normalize-space(../../@iotype)='DO'">
ui.setState( <xsl:value-of select="../../@name"/>,<xsl:value-of select="$setval"/> ); ui.setState( <xsl:value-of select="../../@name"/>,<xsl:value-of select="$setval"/> );
...@@ -319,6 +337,13 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code ...@@ -319,6 +337,13 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
ui.saveValue( si,<xsl:value-of select="$setval"/>,UniversalIO::AnalogInput, getId() ); ui.saveValue( si,<xsl:value-of select="$setval"/>,UniversalIO::AnalogInput, getId() );
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
}
catch( Exception&amp; ex )
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw ex;
}
</xsl:template> </xsl:template>
<xsl:template name="check_changes"> <xsl:template name="check_changes">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment