удалил неиспользуемые теперь $Id$ (остатки от CVS)

Utilities/Admin/admin.cc

-// $Id: admin.cc,v 1.27 2008/11/29 21:24:24 vpashka Exp $
-
 // --------------------------------------------------------------------------
 #include <vector>
 #include <string>

Utilities/DBServer-MySQL/DBInterface.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/06/17 21:30:49 $
- *  \version $Id: DBInterface.cc,v 1.5 2007/06/17 21:30:49 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <sstream>

Utilities/DBServer-MySQL/DBServer_MySQL.cc

@@ -21,7 +21,6 @@
  *  \brief файл реализации DB-сервера
  *  \author Pavel Vainerman
  *  \date   $Date: 2009/02/26 19:55:37 $
- *  \version $Id: DBServer_MySQL.cc,v 1.10 2009/02/26 19:55:37 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

Utilities/DBServer-MySQL/main.cc

-// $Id: main.cc,v 1.8 2008/02/10 03:21:41 vpashka Exp $
-// --------------------------------------------------------------------------
 #include "Configuration.h"
 #include "DBServer_MySQL.h"
 #include "ObjectsActivator.h"

Utilities/InfoServer/main.cc

-// $Id: main.cc,v 1.13 2008/12/14 21:57:49 vpashka Exp $
-// --------------------------------------------------------------------------
 #include "Configuration.h"
 #include "InfoServer.h"
 #include "ISRestorer.h"

Utilities/MBTester/MBSlave.cc

-/*! $Id: MBSlave.cc,v 1.7 2009/02/24 20:27:24 vpashka Exp $ */
 // -------------------------------------------------------------------------
 //#include <sys/time.h>
 //#include <string.h>
@@ -19,8 +18,6 @@ MBSlave::MBSlave( ModbusRTU::ModbusAddr addr, const std::string dev, const std::
 	verbose(false),
 	replyVal(-1)
 {
-	cout << "$Id: MBSlave.cc,v 1.7 2009/02/24 20:27:24 vpashka Exp $" << endl;
-
 //	int replyTimeout = uni_atoi( conf->getArgParam("--reply-timeout",it.getProp("reply_timeout")).c_str() );
 //	if( replyTimeout <= 0 )
 //		replyTimeout = 2000;

Utilities/MBTester/MBTCPServer.cc

-/*! $Id: MBTCPServer.cc,v 1.1 2008/11/22 23:22:23 vpashka Exp $ */
 // -------------------------------------------------------------------------
 //#include <sys/time.h>
 //#include <string.h>
@@ -18,8 +17,6 @@ MBTCPServer::MBTCPServer( ModbusAddr myaddr, const string inetaddr, int port, bo
 //	askCount(0),
 	verbose(verb)
 {
-	cout << "$Id: MBTCPServer.cc,v 1.1 2008/11/22 23:22:23 vpashka Exp $" << endl;
-
 //	int replyTimeout = uni_atoi( conf->getArgParam("--reply-timeout",it.getProp("reply_timeout")).c_str() );
 //	if( replyTimeout <= 0 )
 //		replyTimeout = 2000;

Utilities/MBTester/mbrtuslave.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: mbrtuslave.cc,v 1.2 2009/02/24 20:27:24 vpashka Exp $
 // --------------------------------------------------------------------------
 #include <string>
 #include <getopt.h>

Utilities/MBTester/mbrtutester.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: mbrtutester.cc,v 1.3 2009/02/24 20:27:24 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <string>
 #include <sstream>
 #include <getopt.h>

Utilities/MBTester/mbslave.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: mbslave.cc,v 1.5 2009/02/24 20:27:24 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <string>
 #include <getopt.h>
 #include "Debug.h"

Utilities/MBTester/mbtcpserver.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: mbtcpserver.cc,v 1.1 2008/11/22 23:22:23 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <string>
 #include <cc++/socket.h>
 #include <getopt.h>

Utilities/MBTester/mbtcptester.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: mbtcptester.cc,v 1.1 2008/11/22 23:22:23 vpashka Exp $
 // --------------------------------------------------------------------------
 #include <string>
 #include <getopt.h>

Utilities/NullController/NullController.cc

-// $Id: NullController.cc,v 1.15 2008/12/14 21:57:49 vpashka Exp $
-// --------------------------------------------------------------------------
 #include "Configuration.h"
 #include "NCRestorer.h"
 #include "NullController.h"

Utilities/NullController/main.cc

-// $Id: main.cc,v 1.13 2008/02/10 03:21:41 vpashka Exp $
-// --------------------------------------------------------------------------
 #include "Configuration.h"
 #include "NullController.h"
 #include "ObjectsActivator.h"

Utilities/SImitator/main.cc

-// $Id: main.cc,v 1.1 2009/03/03 12:27:37 pv Exp $
 #include <iostream>
 #include "Exceptions.h"
 #include "UniversalInterface.h"

Utilities/SMonit/smonitor.cc

-// $Id: smonitor.cc,v 1.10 2008/11/29 21:24:24 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <iostream>
 #include <string>
 #include "ObjectsActivator.h"

Utilities/SViewer-text/main.cc

-// $Id: main.cc,v 1.9 2008/02/10 03:21:42 vpashka Exp $
 // --------------------------------------------------------------------------
 #include <string>
 #include "SViewer.h"

Utilities/codegen/tests/TestGen.cc

-// $Id$
-
 #include "Exceptions.h"
 #include "TestGen.h"
 // -----------------------------------------------------------------------------

Utilities/codegen/tests/TestGenAlone.cc

-// $Id$
-
 #include "Exceptions.h"
 #include "TestGenAlone.h"
 // -----------------------------------------------------------------------------

extensions/IOControl/ComediInterface.cc

-// $Id: ComediInterface.cc,v 1.2 2009/01/16 23:16:41 vpashka Exp $
-// -----------------------------------------------------------------------------
 #include <sstream>
 #include <cstdlib>
 #include <cstring>

extensions/IOControl/IOControl.cc

-// $Id: IOControl.cc,v 1.3 2009/01/23 23:56:54 vpashka Exp $
-// -----------------------------------------------------------------------------
 #include <sstream>
 #include "ORepHelpers.h"
 #include "UniSetTypes.h"
@@ -47,7 +45,6 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 	readconf_ok(false),
 	term(false)
 {
-//	cout << "$Id: IOControl.cc,v 1.3 2009/01/23 23:56:54 vpashka Exp $" << endl;
 //	{
 //		string myfullname = conf->oind->getNameById(id);
 //		myname = ORepHelpers::getShortName(myfullname.c_str());

extensions/IOControl/iocontrol.cc

-// $Id: iocontrol.cc,v 1.3 2009/01/17 14:34:40 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <string>
 #include "Debug.h"
 #include "ObjectsActivator.h"

extensions/MBTCPMaster/main.cc

-// $Id: rsexchange.cc,v 1.2 2008/06/06 11:03:32 pv Exp $
-// -----------------------------------------------------------------------------
 #include <sstream>
 #include "MBTCPMaster.h"
 #include "Configuration.h"

extensions/ModbusSlave/mbslave.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: mbslave.cc,v 1.3 2009/01/17 14:34:40 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <sstream>
 #include <string>
 #include <cc++/socket.h>

extensions/RTUExchange/RTUStorage.cc

 // -----------------------------------------------------------------------------
-//!  \version $Id: RTUStorage.cc,v 1.1 2008/12/14 21:57:50 vpashka Exp $
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
 #include <cmath>
 #include <iostream>
 #include <iomanip>

extensions/RTUExchange/mtr-setup.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: mbrtutester.cc,v 1.3 2009/02/24 20:27:24 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <string>
 #include <map>
 #include <list>

extensions/RTUExchange/mtrconv.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: mtrconv.cc,v 1.2 2009/01/22 02:11:23 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <iostream>
 #include <iomanip>
 #include "UniSetTypes.h"

extensions/RTUExchange/rtuexchange.cc

-// $Id: rtuexchange.cc,v 1.3 2009/01/17 14:34:41 vpashka Exp $
-// -----------------------------------------------------------------------------
 #include <sstream>
 #include "ObjectsActivator.h"
 #include "Extensions.h"

extensions/RTUExchange/rtustate.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: rtustate.cc,v 1.1 2008/12/14 21:57:50 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <string>
 #include <getopt.h>
 #include "modbus/ModbusRTUMaster.h"

extensions/RTUExchange/vtconv.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: mtrconv.cc,v 1.2 2009/01/22 02:11:23 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <iostream>
 #include <iomanip>
 #include "UniSetTypes.h"

extensions/SMDBServer/main.cc

-// $Id: rsexchange.cc,v 1.2 2008/06/06 11:03:32 pv Exp $
-// -----------------------------------------------------------------------------
 #include <sstream>
 #include "SMDBServer.h"
 #include "Configuration.h"

extensions/SMViewer/SMViewer.cc

-/*! $Id*/
-//--------------------------------------------------------------------------------
 #include "SMViewer.h"
 #include "Extensions.h"
 //--------------------------------------------------------------------------------

extensions/SharedMemory/SharedMemory.cc

@@ -20,8 +20,6 @@ SharedMemory::SharedMemory( ObjectId id, string datafile ):
 	iotypePulsar(UniversalIO::DigitalInput),
 	msecPulsar(0)
 {
-//	cout << "$Id: SharedMemory.cc,v 1.4 2009/01/24 11:20:19 vpashka Exp $" << endl;
-
 	xmlNode* cnode = conf->getNode("SharedMemory");
 	if( cnode == NULL )
 		throw SystemError("Not find conf-node for SharedMemory");

extensions/SharedMemory/smemory.cc

-// --------------------------------------------------------------------------
-//! \version $Id: smemory.cc,v 1.1 2008/12/14 21:57:50 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <string>
 #include "Debug.h"
 #include "ObjectsActivator.h"

extensions/SharedMemoryPlus/smemory-plus.cc

 // --------------------------------------------------------------------------
-//! \version $Id: smemory-plus.cc,v 1.1 2009/02/10 20:38:27 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <string>
 #include "Debug.h"
 #include "ObjectsActivator.h"

extensions/UDPExchange/UDPNReceiver.cc

+#include <sstream>
+#include "Exceptions.h"
+#include "Extensions.h"
+#include "UDPNReceiver.h"
+// -----------------------------------------------------------------------------
+using namespace std;
+using namespace UniSetTypes;
+using namespace UniSetExtensions;
+// -----------------------------------------------------------------------------
+UDPNReceiver::UDPNReceiver( ost::tpport_t p, ost::IPV4Host h, UniSetTypes::ObjectId shmId, IONotifyController* ic ):
+shm(0),
+ui(conf),
+activate(false),
+udp(0),
+host(h),
+port(p),
+recvTimeout(5000),
+conn(false)
+{
+	{
+		ostringstream s;
+		s << host << ":" << port;
+		myname = s.str();
+	}
+
+	shm = new SMInterface(shmId,&ui,DefaultObjectId,ic);
+
+	if( dlog.debugging(Debug::INFO) )
+		dlog[Debug::INFO] << "(UDPNReceiver): UDP set to " << host << ":" << port << endl;
+
+	try
+	{
+		udp = new ost::UDPDuplex(host,port);
+	}
+	catch( ost::SockException& e )
+	{
+		ostringstream s;
+		s << e.getString() << ": " << e.getSystemErrorString() << endl;
+		throw SystemError(s.str());
+	}
+
+	thr = new ThreadCreator<UDPNReceiver>(this, &UDPNReceiver::poll);
+	thr->start();
+}
+// -----------------------------------------------------------------------------
+UDPNReceiver::~UDPNReceiver()
+{
+	delete udp;
+	delete shm;
+	delete thr;
+}
+// -----------------------------------------------------------------------------
+void UDPNReceiver::poll()
+{
+	while( 1 )
+	{
+		if( !activate )
+		{
+			msleep(1000);
+			continue;
+		}
+		
+		try
+		{
+			recv();
+		}
+		catch( ost::SockException& e )
+		{
+			cerr  << e.getString() << ": " << e.getSystemErrorString() << endl;
+		}
+		catch( UniSetTypes::Exception& ex)
+		{
+			cerr << myname << "(step): " << ex << std::endl;
+		}
+		catch(...)
+		{
+			cerr << myname << "(step): catch ..." << std::endl;
+		}	
+	}
+
+	cerr << "************* execute FINISH **********" << endl;
+}
+// -----------------------------------------------------------------------------
+void UDPNReceiver::recv()
+{	
+	cout << myname << ": recv....(timeout=" << recvTimeout << ")" << endl;
+//	UniSetUDP::UDPHeader h;
+	// receive
+	if( udp->isInputReady(recvTimeout) )
+	{
+/*	  
+		ssize_t ret = udp->UDPReceive::receive(&h,sizeof(h));
+		if( ret<(ssize_t)sizeof(h) )
+		{
+			cerr << myname << "(receive): ret=" << ret << " sizeof=" << sizeof(h) << endl;
+			return;
+		}
+		
+		cout << myname << "(receive): header: " << h << endl;
+		if( h.dcount <=0 )
+		{
+			cout << " data=0" << endl;
+			return;
+		}
+*/
+		UniSetUDP::UDPData d;
+		// ignore echo...
+#if 0
+		if( h.nodeID == conf->getLocalNode() && h.procID == getId() )
+		{
+			for( int i=0; i<h.dcount;i++ )
+			{
+				ssize_t ret = udp->UDPReceive::receive(&d,sizeof(d));
+				if( ret < (ssize_t)sizeof(d) )
+					return;
+			}
+			return;
+		}
+#endif 		
+		cout << "***** request: " << udp->UDPSocket::getIPV4Peer() << endl;
+		for( int i=0; i<100;i++ )
+		{
+			ssize_t ret = udp->UDPReceive::receive(&d,sizeof(d));
+			if( ret<(ssize_t)sizeof(d) )
+			{
+				cerr << myname << "(receive data " << i << "): ret=" << ret << " sizeof=" << sizeof(d) << endl;
+				break;
+			}
+			
+			cout << myname << "(receive data " << i << "): " << d << endl;
+		}
+	}
+//	else
+//	{
+//		cout << "no InputReady.." << endl;
+//	}
+}
+// -----------------------------------------------------------------------------

extensions/UDPExchange/UDPNReceiver.h

+#ifndef UDPNReceiver_H_
+#define UDPNReceiver_H_
+// -----------------------------------------------------------------------------
+#include <ostream>
+#include <string>
+#include <vector>
+#include <cc++/socket.h>
+#include "Mutex.h"
+#include "Trigger.h"
+#include "SMInterface.h"
+#include "SharedMemory.h"
+#include "ThreadCreator.h"
+#include "UDPPacket.h"
+// -----------------------------------------------------------------------------
+class UDPNReceiver
+{
+	public:
+		UDPNReceiver( ost::tpport_t port, ost::IPV4Host host, UniSetTypes::ObjectId shmID, IONotifyController* ic=0 );
+		virtual ~UDPNReceiver();
+
+		inline int getPort(){ return port; }
+		inline bool isConnetcion(){ return conn; }
+
+		inline void start(){ activate = true; }
+		inline void stop(){ activate = false; }
+		inline void setReceiveTimeout( int t ){ recvTimeout = t; }
+		inline std::string getName(){ return myname; }
+		
+
+	protected:
+		SMInterface* shm;
+		UniversalInterface ui;
+
+		void poll();
+		void recv();
+
+		std::string myname;
+	
+	private:
+		UDPNReceiver();
+
+		bool activate;
+		ost::UDPDuplex* udp;
+		ost::IPV4Host host;
+		ost::tpport_t port;
+
+		int recvTimeout;
+		bool conn;
+		
+		ThreadCreator<UDPNReceiver>* thr;
+};
+// -----------------------------------------------------------------------------
+#endif // UDPNReceiver_H_
+// -----------------------------------------------------------------------------

extensions/UDPExchange/UDPPacket.cc

-// $Id: UDPPacket.cc,v 1.1 2009/02/10 20:38:27 vpashka Exp $
-// -----------------------------------------------------------------------------
 #include "UDPPacket.h"
 // -----------------------------------------------------------------------------
 using namespace std;

extensions/UDPExchange/udpexchange.cc

-// $Id: udpexchange.cc,v 1.1 2009/02/10 20:38:27 vpashka Exp $
-// -----------------------------------------------------------------------------
 #include <sstream>
 #include "ObjectsActivator.h"
 #include "Extensions.h"

extensions/UDPExchange/udpreceiver.cc

-// $Id: udpexchange.cc,v 1.1 2009/02/10 20:38:27 vpashka Exp $
-// -----------------------------------------------------------------------------
 #include <sstream>
 #include "ObjectsActivator.h"
 #include "Extensions.h"

extensions/UniNetwork/UniExchange.cc

-// $Id: NetExchange.cc,v 1.2 2009/04/07 16:11:23 pv Exp $
-// --------------------------------------------------------------------------
 #include "Configuration.h"
 #include "Extensions.h"
 #include "Exceptions.h"

extensions/lib/DigitalFilter.cc

 // --------------------------------------------------------------------------
-/*! $Id: DigitalFilter.cc,v 1.2 2009/01/16 23:16:42 vpashka Exp $ */
-// --------------------------------------------------------------------------
 #include <cmath>
 #include <iomanip>
 #include <algorithm>

extensions/lib/Extensions.cc

-// $Id: Extensions.cc,v 1.2 2009/01/17 14:34:41 vpashka Exp $
-// -------------------------------------------------------------------------
 #include <sstream>
 #include <string>
 #include "Configuration.h"

extensions/lib/IOBase.cc

-// $Id: IOBase.cc,v 1.3 2009/01/23 23:56:54 vpashka Exp $
-// -----------------------------------------------------------------------------
 #include "Configuration.h"
 #include "Extensions.h"
 #include "IOBase.h"

extensions/lib/MTR.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: MTR.cc,v 1.1 2008/12/14 21:57:50 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <cmath>
 #include <vector>
 #include <algorithm>

extensions/lib/PID.cc

-// $Id: PID.cc,v 1.1 2008/12/14 21:57:50 vpashka Exp $
-// -----------------------------------------------------------------------------
 #include <iomanip>
 #include "PID.h"
 // -----------------------------------------------------------------------------

extensions/lib/SMInterface.cc

 // --------------------------------------------------------------------------
-/*! $Id: SMInterface.cc,v 1.1 2008/12/14 21:57:50 vpashka Exp $ */
-// --------------------------------------------------------------------------
 #include <sstream>
 #include <iomanip>
 #include "Exceptions.h"

extensions/lib/VTypes.cc

 // --------------------------------------------------------------------------
-//!  \version $Id: VType.cc,v 1.1 2008/12/14 21:57:50 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <cmath>
 #include "VTypes.h"
 // --------------------------------------------------------------------------

src/Communications/ComPort.cc

@@ -6,7 +6,6 @@
  *  \brief Обращения к последовательным интерфейсам
  *  \author Nick Lezzhov
  *  \date   $Date: 2009/02/24 20:27:25 $
- *  \version $Id: ComPort.cc,v 1.6 2009/02/24 20:27:25 vpashka Exp $
  */
 /**************************************************************************/
 #include <cstdlib>

src/Communications/ComPort485F.cc

@@ -3,8 +3,6 @@
 * Copyright (C) 2002 SET Research Institute. All rights reserved.          *
 ***************************************************************************/
 // --------------------------------------------------------------------------------
-// $Id: ComPort485F.cc,v 1.1 2009/02/24 20:27:25 vpashka Exp $
-// --------------------------------------------------------------------------------
 #include <unistd.h>
 #include <termios.h>
 #include <fcntl.h>

src/Communications/Modbus/ModbusClient.cc

-/*! $Id: ModbusClient.cc,v 1.4 2009/01/11 19:08:46 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include <string.h>
 #include <errno.h>
 #include <iostream>

src/Communications/Modbus/ModbusHelpers.cc

-/*! $Id: ModbusHelpers.cc,v 1.1 2009/01/12 20:40:28 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include "modbus/ModbusHelpers.h"
 #include "modbus/ModbusRTUMaster.h"
 #include "Exceptions.h"

src/Communications/Modbus/ModbusRTUMaster.cc

-/*! $Id: ModbusRTUMaster.cc,v 1.3 2009/02/24 20:27:25 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include <string.h>
 #include <errno.h>
 #include <iostream>

src/Communications/Modbus/ModbusRTUSlave.cc

-/*! $Id: ModbusRTUSlave.cc,v 1.3 2009/02/24 20:27:25 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include <sys/time.h>
 #include <cstdlib>
 #include <errno.h>

src/Communications/Modbus/ModbusRTUSlaveSlot.cc

-/*! $Id: ModbusRTUSlaveSlot.cc,v 1.3 2009/02/24 20:27:25 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include "modbus/ModbusRTUSlaveSlot.h"
 // -------------------------------------------------------------------------
 using namespace ModbusRTU;

src/Communications/Modbus/ModbusServer.cc

-/*! $Id: ModbusServer.cc,v 1.3 2008/11/23 22:47:29 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include <sys/time.h>
 #include <fcntl.h>
 #include <string.h>

src/Communications/Modbus/ModbusServerSlot.cc

-/*! $Id: ModbusServerSlot.cc,v 1.1 2008/11/22 23:22:24 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include "modbus/ModbusServerSlot.h"
 // -------------------------------------------------------------------------
 using namespace ModbusRTU;

src/Communications/Modbus/ModbusTCPCore.cc

-/*! $Id: ModbusTCPCore.cc,v 1.1 2008/11/22 23:22:24 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include "modbus/ModbusTCPCore.h"
 // -------------------------------------------------------------------------
 using namespace std;

src/Communications/Modbus/ModbusTCPMaster.cc

-/*! $Id: ModbusTCPMaster.cc,v 1.3 2009/02/07 13:27:01 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include <string.h>
 #include <errno.h>
 #include <iostream>

src/Communications/Modbus/ModbusTCPServer.cc

-/*! $Id: ModbusTCPServer.cc,v 1.2 2008/11/23 22:16:04 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include <iostream>
 #include <sstream>
 #include "Exceptions.h"

src/Communications/Modbus/ModbusTCPServerSlot.cc

-/*! $Id: ModbusTCPServerSlot.cc,v 1.2 2009/01/11 19:08:46 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include "modbus/ModbusTCPServerSlot.h"
 // -------------------------------------------------------------------------
 using namespace ModbusRTU;

src/Communications/Modbus/ModbusTCPTypes.cc

-/*! $Id: ModbusTCPTypes.cc,v 1.1 2008/11/22 23:22:24 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include <assert.h>
 #include <string>
 #include <iostream>

src/Communications/Modbus/ModbusTypes.cc

-/*! $Id: ModbusTypes.cc,v 1.9 2008/11/23 22:16:04 vpashka Exp $ */
-// -------------------------------------------------------------------------
 #include <assert.h>
 #include <string>
 #include <iostream>

src/IOs/AnalogCard_AI165A.cc

 // This file is part of the NCS project. (c) 1999-2000 All rights reserved.
-// $Id: AnalogCard_AI165A.cc,v 1.5 2005/01/28 21:04:08 vitlav Exp $
 
 // 14-ти битная аналоговая карта 16 входов (8 дифф), 2 выхода (12-ти битные)
 /*

src/IOs/DigitalCard_O5600.cc

@@ -6,7 +6,6 @@
  *  \brief Класс для дискретной карты O5600
  *  \author Vitaly Lipatov
  *  \date   $Date: 2006/12/19 15:46:14 $
- *  \version $Id: DigitalCard_O5600.cc,v 1.6 2006/12/19 15:46:14 vpashka Exp $
  *  
  *  
  */

src/Interfaces/UniversalInterface.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2008/12/14 21:57:51 $
- *  \version $Id: UniversalInterface.cc,v 1.26 2008/12/14 21:57:51 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <omniORB4/CORBA.h>

src/ObjectRepository/IORFile.cc

 // This file is part of the UniSet project.
-// $Id: IORFile.cc,v 1.5 2008/09/16 22:48:39 vpashka Exp $
 
 /* This file is part of the UniSet project
  * Copyright (C) 2002 Vitaly Lipatov

src/ObjectRepository/ORepHelpers.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/18 19:13:35 $
- *  \version: $Id: ORepHelpers.cc,v 1.12 2007/11/18 19:13:35 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <omniORB4/CORBA.h>

src/ObjectRepository/ObjectIndex.cc

 // This file is part of the UniSet project.
-// $Id: ObjectIndex.cc,v 1.10 2008/09/16 19:02:46 vpashka Exp $
 
 /* This file is part of the UniSet project
  * Copyright (C) 2002 Vitaly Lipatov <lav@etersoft.ru>

src/ObjectRepository/ObjectIndex_Array.cc

 // This file is part of the UniSet project.
-// $Id: ObjectIndex_Array.cc,v 1.5 2008/11/22 23:22:25 vpashka Exp $
 
 /* This file is part of the UniSet project
  * Copyright (C) 2002 Vitaly Lipatov <lav@etersoft.ru>

src/ObjectRepository/ObjectIndex_XML.cc

 // This file is part of the UniSet project.
-// $Id: ObjectIndex_XML.cc,v 1.12 2008/11/22 23:22:25 vpashka Exp $
 
 /* This file is part of the UniSet project
  * Copyright (C) 2003 Pavel Vainerman <pv@etersoft.ru>

src/ObjectRepository/ObjectIndex_idXML.cc

-// $Id: ObjectIndex_idXML.cc,v 1.6 2008/11/22 23:22:25 vpashka Exp $
 // -----------------------------------------------------------------------------------------
 #include <sstream>
 #include <iomanip>

src/ObjectRepository/ObjectRepository.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/27 21:54:19 $
- *  \version $Id: ObjectRepository.cc,v 1.13 2007/11/27 21:54:19 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <omniORB4/CORBA.h>

src/ObjectRepository/ObjectRepositoryFactory.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/18 19:13:35 $
- *  \version $Id: ObjectRepositoryFactory.cc,v 1.16 2007/11/18 19:13:35 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <omniORB4/CORBA.h>

src/ObjectRepository/ObjectsActivator.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2008/12/14 21:57:51 $
- *  \version $Id: ObjectsActivator.cc,v 1.15 2008/12/14 21:57:51 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/ObjectRepository/ObjectsManager.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2009/02/10 20:38:27 $
- *  \version $Id: ObjectsManager.cc,v 1.22 2009/02/10 20:38:27 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <cstdlib>

src/ObjectRepository/ObjectsManager_LT.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2005/01/28 21:07:41 $
- *  \version $Id: ObjectsManager_LT.cc,v 1.4 2005/01/28 21:07:41 vitlav Exp $
 */
 // -------------------------------------------------------------------------- 
 #include "Exceptions.h"

src/ObjectRepository/PassiveObject.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2008/02/21 19:59:57 $
- *  \version $Id: PassiveObject.cc,v 1.12 2008/02/21 19:59:57 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/ObjectRepository/ProxyManager.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2008/11/29 21:24:25 $
- *  \version $Id: ProxyManager.cc,v 1.13 2008/11/29 21:24:25 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <sstream>

src/ObjectRepository/UniSetObject.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/29 22:19:54 $
- *  \version $Id: UniSetObject.cc,v 1.27 2007/11/29 22:19:54 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <unistd.h>

src/ObjectRepository/UniSetObject_LT.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2005/01/28 21:07:41 $
- *  \version $Id: UniSetObject_LT.cc,v 1.5 2005/01/28 21:07:41 vitlav Exp $
 */
 // -------------------------------------------------------------------------- 
 #include "Exceptions.h"

src/ObjectRepository/UniSetTypes.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2009/01/16 23:16:42 $
- *  \version $Id: UniSetTypes.cc,v 1.4 2009/01/16 23:16:42 vpashka Exp $
 */
 // -----------------------------------------------------------------------------
 #include <cmath>

src/Processes/IOController.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2009/02/07 13:25:59 $
- *  \version $Id: IOController.cc,v 1.30 2009/02/07 13:25:59 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 //#include <stream.h>

src/Processes/IONotifyController.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2008/11/29 21:24:25 $
- *  \version $Id: IONotifyController.cc,v 1.31 2008/11/29 21:24:25 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Processes/IONotifyController_LT.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2005/01/28 21:09:33 $
- *  \version $Id: IONotifyController_LT.cc,v 1.4 2005/01/28 21:09:33 vitlav Exp $
 */
 // -------------------------------------------------------------------------- 
 #include "Exceptions.h"

src/Processes/UniSetObserver.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2005/01/28 21:09:33 $
- *  \version $Id: UniSetObserver.cc,v 1.5 2005/01/28 21:09:33 vitlav Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Services/DBServer.cc

@@ -21,7 +21,6 @@
  *  \brief файл реализации DB-сервера
  *  \author Pavel Vainerman
  *  \date   $Date: 2006/12/20 13:43:41 $
- *  \version $Id: DBServer.cc,v 1.12 2006/12/20 13:43:41 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Services/InfoServer.cc

@@ -21,7 +21,6 @@
  *  \brief файл реализации Info-сервера
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/01/17 23:33:41 $
- *  \version $Id: InfoServer.cc,v 1.14 2007/01/17 23:33:41 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <string>

src/Services/RepositoryAgent.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2005/01/28 21:10:33 $
- *  \version $Id: RepositoryAgent.cc,v 1.5 2005/01/28 21:10:33 vitlav Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Services/TimerService.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/06/17 21:30:58 $
- *  \version $Id: TimerService.cc,v 1.8 2007/06/17 21:30:58 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <unistd.h>

src/Threads/PosixThread.cc

@@ -20,7 +20,6 @@
 /*! \file
  * \author Anthony Korbin
  * \date   $Date: 2005/10/06 21:47:42 $
- * \version $Id: PosixThread.cc,v 1.8 2005/10/06 21:47:42 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include "PosixThread.h"

src/Timers/PassiveSysTimer.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2005/01/28 21:12:49 $
- *  \version $Id: PassiveSysTimer.cc,v 1.6 2005/01/28 21:12:49 vitlav Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Timers/PassiveTimer.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/29 22:19:54 $
- *  \version $Id: PassiveTimer.cc,v 1.13 2007/11/29 22:19:54 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <time.h>

src/Timers/ThrPassiveTimer.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/08/02 22:52:28 $
- *  \version $Id: ThrPassiveTimer.cc,v 1.7 2007/08/02 22:52:28 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Timers/WaitingPassiveTimer.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2005/01/28 21:12:49 $
- *  \version $Id: WaitingPassiveTimer.cc,v 1.6 2005/01/28 21:12:49 vitlav Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Various/Configuration.cc

@@ -21,7 +21,6 @@
  *  \brief Класс работы с конфигурацией
  *  \author Vitaly Lipatov, Pavel Vainerman
  *  \date   $Date: 2008/09/16 19:02:46 $
- *  \version $Id: Configuration.cc,v 1.41 2008/09/16 19:02:46 vpashka Exp $
  */
 // --------------------------------------------------------------------------
 

src/Various/CycleStorage.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Ivan Donchevskiy
  *  \date   $Date: 2009/07/15 15:55:00 $
- *  \version $Id: Jrn.h,v 1.0 2009/07/15 15:55:00 vpashka Exp $
  */
 // --------------------------------------------------------------------------
 

src/Various/ISRestorer.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2005/07/21 17:41:43 $
- *  \version $Id: ISRestorer.cc,v 1.1 2005/07/21 17:41:43 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Various/ISRestorer_XML.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2008/12/14 21:57:51 $
- *  \version $Id: ISRestorer_XML.cc,v 1.6 2008/12/14 21:57:51 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <sstream>

src/Various/LT_Object.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/18 19:13:35 $
- *  \version $Id: LT_Object.cc,v 1.6 2007/11/18 19:13:35 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <sstream>

src/Various/MessageInterface_XML.cc

 // This file is part of the UniSet project.
-// $Id: MessageInterface_XML.cc,v 1.12 2008/11/22 23:22:25 vpashka Exp $
 
 /* This file is part of the UniSet project
  * Copyright (C) 2003 Pavel Vainerman <pv@etersoft.ru>

src/Various/MessageInterface_idXML.cc

@@ -2,7 +2,6 @@
  *  \brief Класс работы с сообщениями
  *  \author Pavel Vainerman
  *  \date   $Date: 2008/11/22 23:22:25 $
- *  \version $Id: MessageInterface_idXML.cc,v 1.8 2008/11/22 23:22:25 vpashka Exp $
  */
 /**************************************************************************/
 #include <sstream>

src/Various/MessageType.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/06/17 21:30:58 $
- *  \version $Id: MessageType.cc,v 1.15 2007/06/17 21:30:58 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Various/Mutex.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/15 23:53:36 $
- *  \version $Id: Mutex.cc,v 1.14 2007/11/15 23:53:36 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Various/NCRestorer.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/12/18 20:24:12 $
- *  \version $Id: NCRestorer.cc,v 1.9 2007/12/18 20:24:12 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 

src/Various/NCRestorer_XML.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2009/01/11 19:08:46 $
- *  \version $Id: NCRestorer_XML.cc,v 1.19 2009/01/11 19:08:46 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <sstream>

src/Various/Restorer_XML.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/18 19:13:35 $
- *  \version $Id: Restorer_XML.cc,v 1.5 2007/11/18 19:13:35 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <sstream>

src/Various/RunLock.cc

@@ -21,7 +21,6 @@
  *  \brief Блокировка повторного запуска программы
  *  \author Ahton Korbin<ahtoh>, Pavel Vainerman
  *  \date   $Date: 2006/12/20 13:43:41 $
- *  \version $Id: RunLock.cc,v 1.8 2006/12/20 13:43:41 vpashka Exp $
 */
 // --------------------------------------------------------------------------
 #include <dirent.h>

src/Various/SMonitor.cc

-// $Id: SMonitor.cc,v 1.8 2008/02/10 03:21:42 vpashka Exp $
 // ------------------------------------------------------------------------------------------
 #include <sstream>
 #include <iomanip>

src/Various/SViewer.cc

@@ -21,7 +21,6 @@
  *  \brief Программа просмотра состояния датчиков
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/18 19:13:35 $
- *  \version $Id: SViewer.cc,v 1.15 2007/11/18 19:13:35 vpashka Exp $
  */
 // --------------------------------------------------------------------------
 #include <sstream>

src/Various/SystemGuard.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Pavel Vainerman
  *  \date   $Date: 2007/11/18 19:13:35 $
- *  \version $Id: SystemGuard.cc,v 1.11 2007/11/18 19:13:35 vpashka Exp $
 */
 // -------------------------------------------------------------------------- 
 #include <sstream>

src/Various/TableBlockStorage.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Ivan Donchevskiy
  *  \date   $Date: 2009/07/15 15:55:00 $
- *  \version $Id: Jrn.h,v 1.0 2009/07/15 15:55:00vpashka Exp $
  */
 // --------------------------------------------------------------------------
 

src/Various/TableStorage.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Ivan Donchevskiy
  *  \date   $Date: 2009/07/15 15:55:00 $
- *  \version $Id: Jrn.h,v 1.0 2009/07/15 15:55:00vpashka Exp $
  */
 // --------------------------------------------------------------------------
 

src/Various/TextFileIndex.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Vitaly Lipatov
  *  \date   $Date: 2005/01/28 21:14:18 $
- *  \version $Id: TextFileIndex.cc,v 1.6 2005/01/28 21:14:18 vitlav Exp $
  *  \par
  * Базовый класс получения строки по её индексу
  */

src/Various/TextIndex.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Vitaly Lipatov
  *  \date   $Date: 2005/01/28 21:14:18 $
- *  \version $Id: TextIndex.cc,v 1.6 2005/01/28 21:14:18 vitlav Exp $
  *  \par
  * Базовый класс получения строки по её индексу
  */

src/Various/UniXML.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Vitaly Lipatov
  *  \date   $Date: 2006/12/20 13:43:41 $
- *  \version $Id: UniXML.cc,v 1.13 2006/12/20 13:43:41 vpashka Exp $
  *  \par
  */
 // --------------------------------------------------------------------------

src/Various/WDTInterface.cc

 // --------------------------------------------------------------------------	
-/*! $Id: WDTInterface.cc,v 1.2 2009/01/16 23:16:42 vpashka Exp $ */
 // --------------------------------------------------------------------------
 #include <iostream>
 #include <cstring>

tests/JrnTests/JrnTest.cc

@@ -20,7 +20,6 @@
 /*! \file
  *  \author Ivan Donchevskiy
  *  \date   $Date: 2009/07/15 15:55:00 $
- *  \version $Id: Jrn.h,v 1.0 2009/07/15 15:55:00 vpashka Exp $
  */
 // --------------------------------------------------------------------------
 

tests/UniXmlTest/XmlTest.cc

@@ -20,11 +20,8 @@
 /*! \file
  *  \author Ivan Donchevskiy
  *  \date   $Date: 2009/07/15 15:55:00 $
- *  \version $Id: Jrn.h,v 1.0 2009/07/28 16:55:00 vpashka Exp $
  */
 // --------------------------------------------------------------------------
-
-
 #include "stdio.h"
 #include "stdlib.h"
 #include "string.h"

tests/conftest.cc

 // --------------------------------------------------------------------------
-//! \version $Id: smemory.cc,v 1.1 2008/12/14 21:57:50 vpashka Exp $
-// --------------------------------------------------------------------------
 #include <string>
 #include "Debug.h"
 #include "Configuration.h"