Добавил функцию getIOType..

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 0.99
-Release: eter7
+Release: eter8
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++

configure.ac

@@ -3,7 +3,7 @@
 # See doc: http://www.gnu.org/software/hello/manual/autoconf/Generic-Programs.html
 
 # AC_PREREQ(2.59)
-AC_INIT([uniset], [0.99.1], pv@etersoft.ru)
+AC_INIT([uniset], [0.99.2], pv@etersoft.ru)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
 # AC_CONFIG_MACRO_DIR([m4])
@@ -30,7 +30,7 @@ AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
 AM_PROG_LIBTOOL
 
-LIBVER=0:9:0
+LIBVER=0:9:2
 AC_SUBST(LIBVER)
 
 # Checks for libraries.

include/Configuration.h

@@ -110,6 +110,8 @@ namespace UniSetTypes
 		xmlNode* getXMLServicesSection();
 		xmlNode* getXMLNodesSection();
 		xmlNode* getXMLObjectNode( UniSetTypes::ObjectId );
+		UniversalIO::IOTypes getIOType( UniSetTypes::ObjectId );
+		UniversalIO::IOTypes getIOType( const std::string name );
 	
 		// net
 		inline unsigned int getCountOfNet() const { return countOfNet; }

include/ObjectIndex.h

@@ -42,6 +42,7 @@ class ObjectIndex
 
 		// info
 		virtual const ObjectInfo* getObjectInfo( const ObjectId )=0;
+		virtual const ObjectInfo* getObjectInfo( const std::string name )=0;
 
 		// создание полного имени в репозитории по паре имя:узел
 		static std::string mkRepName( const std::string repname, const std::string nodename );

include/ObjectIndex_Array.h

@@ -48,6 +48,7 @@ class ObjectIndex_Array:
 
 
 		virtual const ObjectInfo* getObjectInfo(const ObjectId);
+		virtual const ObjectInfo* getObjectInfo( const std::string name );
 		virtual ObjectId getIdByName(const std::string& name);
 		virtual std::string getMapName(const ObjectId id);
 		virtual std::string getTextName(const ObjectId id);

include/ObjectIndex_XML.h

@@ -47,7 +47,8 @@ class ObjectIndex_XML:
 		ObjectIndex_XML(UniXML& xml, int minSize=1000 );
 		virtual ~ObjectIndex_XML();
 
-		virtual const ObjectInfo* getObjectInfo(const ObjectId);
+		virtual const UniSetTypes::ObjectInfo* getObjectInfo(const ObjectId);
+		virtual const UniSetTypes::ObjectInfo* getObjectInfo( const std::string name );
 		virtual ObjectId getIdByName(const std::string& name);
 		virtual std::string getMapName(const ObjectId id);
 		virtual std::string getTextName(const ObjectId id);

include/ObjectIndex_idXML.h

@@ -17,6 +17,7 @@ class ObjectIndex_idXML:
 		virtual ~ObjectIndex_idXML();
 
 		virtual const UniSetTypes::ObjectInfo* getObjectInfo( const UniSetTypes::ObjectId );
+		virtual const UniSetTypes::ObjectInfo* getObjectInfo( const std::string name );
 		virtual UniSetTypes::ObjectId getIdByName( const std::string& name );
 		virtual std::string getMapName( const UniSetTypes::ObjectId id );
 		virtual std::string getTextName( const UniSetTypes::ObjectId id );

src/ObjectRepository/ObjectIndex_Array.cc

@@ -117,3 +117,12 @@ const ObjectInfo* ObjectIndex_Array::getObjectInfo( const ObjectId id )
 
 }
 // -----------------------------------------------------------------------------------------
+const ObjectInfo* ObjectIndex_Array::getObjectInfo( const std::string name )
+{
+	MapObjectKey::iterator it = mok.find(name);
+	if( it != mok.end() )
+	  	return &(objectInfo[it->second]);
+
+	return NULL;
+}
+// ------------------------------------------------------------------------------------------

src/ObjectRepository/ObjectIndex_XML.cc

@@ -285,3 +285,12 @@ const ObjectInfo* ObjectIndex_XML::getObjectInfo( const ObjectId id )
 	return NULL;
 }
 // ------------------------------------------------------------------------------------------
+const ObjectInfo* ObjectIndex_XML::getObjectInfo( const std::string name )
+{
+	MapObjectKey::iterator it = mok.find(name);
+	if( it != mok.end() )
+		return &(omap[it->second]);
+
+	return NULL;
+}
+// ------------------------------------------------------------------------------------------

src/ObjectRepository/ObjectIndex_idXML.cc

@@ -229,3 +229,15 @@ const ObjectInfo* ObjectIndex_idXML::getObjectInfo( const ObjectId id )
 	return NULL;
 }
 // ------------------------------------------------------------------------------------------
+const ObjectInfo* ObjectIndex_idXML::getObjectInfo( const std::string name )
+{
+	const char* n = name.c_str();
+	for( MapObjects::iterator it=omap.begin(); it!=omap.end(); it++ )
+	{
+		  if( !strcmp(it->second.repName,n) )
+			  return &(it->second);
+	}
+
+	return NULL;
+}
+// ------------------------------------------------------------------------------------------

src/Various/Configuration.cc

@@ -1036,6 +1036,30 @@ xmlNode* Configuration::getXMLObjectNode( UniSetTypes::ObjectId id )
 	return 0;
 }
 // -------------------------------------------------------------------------
+UniversalIO::IOTypes Configuration::getIOType( UniSetTypes::ObjectId id )
+{
+	const ObjectInfo* i = oind->getObjectInfo(id);
+	if( i && (xmlNode*)(i->data) )
+	{
+		UniXML_iterator it((xmlNode*)(i->data));
+		return UniSetTypes::getIOType( it.getProp("iotype") );
+	}
+
+	return UniversalIO::UnknownIOType;
+}
+// -------------------------------------------------------------------------
+UniversalIO::IOTypes Configuration::getIOType( const std::string name )
+{
+	const ObjectInfo* i = oind->getObjectInfo(name);
+	if( i && (xmlNode*)(i->data) )
+	{
+		UniXML_iterator it((xmlNode*)(i->data));
+		return UniSetTypes::getIOType( it.getProp("iotype") );
+	}
+
+	return UniversalIO::UnknownIOType;
+}
+// -------------------------------------------------------------------------
 void uniset_init( int argc, const char* const* argv, const std::string xmlfile )
 {
 	string confile = UniSetTypes::getArgParam( "--confile", argc, argv, xmlfile );

tests/conftest.cc

@@ -20,8 +20,16 @@ int main(int argc, const char **argv)
 		conf = new Configuration(argc, argv, confile);
 
 		string t(conf->oind->getTextName(1));
-
 		cout << "**** check getTextName: " << ( t.empty() ?  "FAILED" : "OK" ) << endl;
+
+		string mn(conf->oind->getMapName(1));
+		cout << "**** check getMapName: " << ( mn.empty() ?  "FAILED" : "OK" ) << endl;
+
+		UniversalIO::IOTypes t1=conf->getIOType(1);
+		cout << "**** check getIOType(id): (" << t1 << ") " << ( t1 == UniversalIO::UnknownIOType ?  "FAILED" : "OK" ) << endl;		
+		UniversalIO::IOTypes t2=conf->getIOType(mn);
+		cout << "**** check getIOType(name): (" << t2 << ") " << ( t2 == UniversalIO::UnknownIOType ?  "FAILED" : "OK" ) << endl;		
+
 		return 0;
 	}
 	catch(SystemError& err)