[commit] r1084 - trunk/GME/Parser

[GMESRC Repository Notifications]

Author: volgy
Date: Mon Nov 15 13:14:50 2010
New Revision: 1084

Log:
Fixing GME-313: Project "Version" value not imported from XME.

Modified:
   trunk/GME/Parser/MgaParser.cpp
   trunk/GME/Parser/MgaParser.h

Modified: trunk/GME/Parser/MgaParser.cpp
==============================================================================
--- trunk/GME/Parser/MgaParser.cpp	Mon Nov 15 12:18:55 2010	(r1083)
+++ trunk/GME/Parser/MgaParser.cpp	Mon Nov 15 13:14:50 2010	(r1084)
@@ -262,6 +262,9 @@
 		libstodo.clear();
 		
 		COMTHROW( project->put_GUID(projectguid) );
+		if (projectversion) {
+			COMTHROW( project->put_Version(projectversion) );
+		}
 
 		COMTHROW( project->CommitTransaction() );
 		COMTHROW( project->Notify(APPEVENT_XML_IMPORT_END));
@@ -770,6 +773,14 @@
 
 			CopyTo(guid, projectguid);
 		}
+		else if( i->first == "version" )
+		{	
+			CComBSTR currversion;
+			COMTHROW( project->get_Version(&currversion) );
+			if (currversion.Length() == 0) {
+				CopyTo(i->second, &projectversion); 
+			}
+		}
 		else if( i->first == "metaname")
 		{
 			// if host paradigm != imported project's paradigm

Modified: trunk/GME/Parser/MgaParser.h
==============================================================================
--- trunk/GME/Parser/MgaParser.h	Mon Nov 15 12:18:55 2010	(r1083)
+++ trunk/GME/Parser/MgaParser.h	Mon Nov 15 13:14:50 2010	(r1084)
@@ -97,6 +97,7 @@
 	typedef std::vector<librecord> librecords;
 	librecords libstodo;
 	CComVariant projectguid;
+	CComBSTR	projectversion;
 
 // ------- Logging