[commit] r1118 - trunk/GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jan  7 19:19:00 2011
New Revision: 1118

Log:
Fix bug with specifying Prefix Kinds when an atom has a rolename

Modified:
   trunk/GME/MgaUtil/MgaResolver.cpp

Modified: trunk/GME/MgaUtil/MgaResolver.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaResolver.cpp	Fri Jan  7 19:18:07 2011	(r1117)
+++ trunk/GME/MgaUtil/MgaResolver.cpp	Fri Jan  7 19:19:00 2011	(r1118)
@@ -734,8 +734,20 @@
 
 			CString c1((BSTR) targ_kind_name);
 			CString c2(kind);
+			CString c3;
 
-			if ((c2 == "") || (c2 == c1)) {
+			if (isAlterationSet() && (m_alter_option == CH_PREFIX || m_alter_option == CH_MIGRATE))
+			{
+				CComBSTR role2 = prefixIt(role);
+				CopyTo(role2, c3);
+			}
+			else if (isAlterationSet() && m_alter_option == CH_TRUNCATE)
+			{
+				CComBSTR role2 = truncIt(role);
+				CopyTo(role2, c3);
+			}
+
+			if ((c2 == "") || (c2 == c1) || (c3 != "" && c1 == c3)) {
 
 				COMTHROW(targ_fco->get_ObjType(&targ_objtype));