[GME-commit] GMESRC/GME/MgaUtil MgaResolver.cpp,1.10,1.11

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/MgaUtil
In directory braindrain:/tmp/cvs-serv26986/GME/MgaUtil

Modified Files:
	MgaResolver.cpp 
Log Message:
The Resolver does not resolve RootFolders automatically ("first folder rule"). It caused faulty library import (wrong metaref id was assigned to library roots)

CVS User: volgy

Index: MgaResolver.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaResolver.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MgaResolver.cpp	13 Oct 2003 07:12:48 -0000	1.10
--- MgaResolver.cpp	9 Mar 2004 21:35:57 -0000	1.11
***************
*** 148,152 ****
  			if (mfs_count > 0) {
  
! 				if (mfs_count == 1) {
  
  					COMTHROW( mfolders->get_Item(1, p) );
--- 148,154 ----
  			if (mfs_count > 0) {
  
! 				// Get the first defined folder, but do not automatically resolve 
! 				// root folder (otherwise, library import does not work)
! 				if (mfs_count == 1 && CString(kind) != "RootFolder") {
  
  					COMTHROW( mfolders->get_Item(1, p) );