[GME-commit] GMESRC/GME/Parser MgaDumper.cpp,1.10,1.11

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

Update of /var/lib/gme/GMESRC/GME/Parser
In directory braindrain:/tmp/cvs-serv27157/GME/Parser

Modified Files:
	MgaDumper.cpp 
Log Message:
Inproper handling of parentless FCOs are fixed in XML based drag'n'drop.

CVS User: volgy

Index: MgaDumper.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MgaDumper.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MgaDumper.cpp	26 Feb 2004 17:52:45 -0000	1.10
--- MgaDumper.cpp	14 Mar 2004 15:32:52 -0000	1.11
***************
*** 490,508 ****
  
  		VARIANT_BOOL prim = VARIANT_TRUE;
  		CComObjPtr<IMgaFCO> derivedfrom;
  		COMTHROW( fco->get_DerivedFrom(PutOut(derivedfrom)) );
! 		if( (derivedfrom != NULL) && (CheckInClosure(derivedfrom)))
  		{
! 			Attr("derivedfrom", derivedfrom, IMgaFCO::get_ID);
  
! 			VARIANT_BOOL b;
  
! 			COMTHROW( fco->get_IsInstance(&b) );
! 			Attr("isinstance", b != VARIANT_FALSE ? "yes" : "no");
  
! 			COMTHROW( fco->get_IsPrimaryDerived(&prim) );
! 			Attr("isprimary", prim != VARIANT_FALSE ? "yes" : "no");
  		}
! 		if(prim && dumpversion >= 1) LAttr("relid", fco, IMgaFCO::get_RelID);
  	}
  
--- 490,514 ----
  
  		VARIANT_BOOL prim = VARIANT_TRUE;
+ 		bool lost_basetype = false;
  		CComObjPtr<IMgaFCO> derivedfrom;
  		COMTHROW( fco->get_DerivedFrom(PutOut(derivedfrom)) );
! 		if(derivedfrom != NULL )
  		{
! 			if (CheckInClosure(derivedfrom)) {
! 				Attr("derivedfrom", derivedfrom, IMgaFCO::get_ID);
  
! 				VARIANT_BOOL b;
  
! 				COMTHROW( fco->get_IsInstance(&b) );
! 				Attr("isinstance", b != VARIANT_FALSE ? "yes" : "no");
  
! 				COMTHROW( fco->get_IsPrimaryDerived(&prim) );
! 				Attr("isprimary", prim != VARIANT_FALSE ? "yes" : "no");
! 			}
! 			else {
! 				lost_basetype = true;
! 			}
  		}
! 		if(prim && (dumpversion >= 1) && (!lost_basetype)) LAttr("relid", fco, IMgaFCO::get_RelID);
  	}