(DB): "db_ignore" --> "dbignore"

IDL/Processes/Makefile.am

@@ -8,7 +8,6 @@ HHDIR=$(top_builddir)/include
 
 # Исходные файлы IDL
 IDLFILES=IOController_i.idl
-#UniSetObserver_i.idl
 
 include $(top_builddir)/conf/idl.mk
 

IDL/Processes/UniSetObserver_i.idl

-/* This file is part of the UniSet project
- * Copyright (c) 2002 Free Software Foundation, Inc.
- * Copyright (c) 2002 Pavel Vainerman
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-// --------------------------------------------------------------------------
-/*! \file
- *  \author Pavel Vainerman
- *  \date   $Date: 2005/01/28 20:27:06 $
- *  \version $Id: UniSetObserver_i.idl,v 1.4 2005/01/28 20:27:06 vitlav Exp $
-*/
-// --------------------------------------------------------------------------
-#ifndef UniSetObserver_i_IDL_
-#define UniSetObserver_i_IDL_
-// --------------------------------------------------------------------------------------------------------------
-#include "../UniSetTypes/UniSetTypes_i.idl"
-// --------------------------------------------------------------------------------------------------------------
-/*!
- * \interface UniSetObserver_i
- * \brief шаблон "Наблюдатель"
-*/ 
-interface UniSetObserver_i
-{
-	// исключения
-	exception NameNotFound
-	{	
-    	string err;
-	};
-
-	void attach( in UniSetTypes::ObjectId id, in UniSetTypes::ObjectId fromid ) raises(NameNotFound);
-	void detach( in UniSetTypes::ObjectId id, in UniSetTypes::ObjectId fromid ) raises(NameNotFound);
-};
-
-// --------------------------------------------------------------------------------------------------------------
-
-#endif
\ No newline at end of file

TODO

@@ -33,6 +33,5 @@ iocontrol:
 Version 2.0
 ============
 - отказаться от функций getState,setState,saveState,saveValue и оставить только getValue/setValue.
-- (DBServer): сделать возможность задать для датчика в configure.xml dbignore="1". Видимо надо встроить это поле в SensorMessgage
 - написать документацию по ModbusSlave
 

conf/test.xml

@@ -155,7 +155,7 @@
 		</nodes>
 		<!-- ************************ Датчики ********************** -->
 		<sensors name="Sensors">
-			<item db_ignore="1" default="1" id="1" iotype="DI" name="Input1_S" priority="Medium" textname="Команда 1"/>
+			<item dbignore="1" default="1" id="1" iotype="DI" name="Input1_S" priority="Medium" textname="Команда 1"/>
 			<item id="2" iotype="DI" mbaddr="0x01" mbfunc="0x06" mbreg="0x02" nbit="11" mbtype="rtu" name="Input2_S" priority="Medium" rs="4" textname="Команда 2"/>
 			<item id="3" iotype="DI"  mbtcp="1" mbtcp_mbaddr="0x02" mbtcp_mbfunc="0x03" mbtcp_mbreg="0x02" mbtcp_mbtype="rtu" name="Input3_S" priority="Medium" textname="Команда 3"/>
 			<item id="4" iotype="DI" mbaddr="0x02" mbfunc="0x04" mbreg="0x02" mbtype="rtu" name="Input4_S" priority="Medium" rs="2" textname="Команда 4"/>

src/Various/NCRestorer_XML.cc

@@ -314,7 +314,7 @@ bool NCRestorer_XML::getSensorInfo( UniXML& xml, xmlNode* it, SInfo& inf )
 	}
 
 	inf.default_val = xml.getIntProp(it,"default");
-	inf.db_ignore = xml.getIntProp(it,"db_ignore");
+	inf.db_ignore = xml.getIntProp(it,"dbignore");
 	inf.value 		= inf.default_val;
 	inf.undefined = false;
 	inf.real_value = inf.value;