[commit] r2672 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri May  5 16:54:15 2017
New Revision: 2672

Log:
Update through XML confirmation: show paradigm version if it has it, otherwise GUID

Modified:
   trunk/GME/Gme/GMEApp.cpp

Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp	Tue May  2 18:06:22 2017	(r2671)
+++ trunk/GME/Gme/GMEApp.cpp	Fri May  5 16:54:15 2017	(r2672)
@@ -2438,13 +2438,14 @@
 		COMTHROW( mgaMetaProject->get_Name(PutOut(parname)) );
 		CComBstrObj metaconn;
 
+        CComPtr<IMgaRegistrar> reg;
+        COMTHROW( reg.CoCreateInstance(L"Mga.MgaRegistrar") );
 		CComBstrObj currentguid;
+        GUID currentguid_guid;
 		{
 			CComVariant parguid;
 			COMTHROW( mgaMetaProject->get_GUID(&parguid) );
 
-			CComPtr<IMgaRegistrar> reg;
-			COMTHROW( reg.CoCreateInstance(L"Mga.MgaRegistrar") );
 			CComVariant pg2;
 
 			COMTHROW(reg->QueryParadigm(parname, PutOut(metaconn), &pg2, REGACCESS_PRIORITY));
@@ -2455,6 +2456,7 @@
 			CopyTo(gg, parguid1);
 
 			CopyTo(pg2,gg);
+            currentguid_guid = gg;
 			CopyTo(gg, currentguid);
 
 			if(!parguid1.Compare(currentguid)) {
@@ -2512,8 +2514,12 @@
 		else
 			COMTHROW(parser->ParseProject(mgaProject,PutInBstr(CString(xmlname))) );
 		{
-			CString buf = CString(_T("The model has been updated\nCurrent ID: "))
-				+ currentguid + L"\nThe original model has been saved to " + backupname;
+            _bstr_t version;
+			_variant_t v_guid;
+			CopyTo(currentguid_guid, &v_guid);
+            reg->VersionFromGUID(parname, v_guid, version.GetAddress(), REGACCESS_PRIORITY);
+			CString buf = CString(_T("The model has been updated.\nCurrent version: "))
+				+ (version.length() ? static_cast<const wchar_t*>(version) : currentguid) + L"\nThe original model has been saved to " + backupname;
 			AfxMessageBox(buf);
 		}
 	}