[GME-commit] GMESRC/GME/Gme GMEDoc.cpp,1.21,1.22 GMEOLEData.cpp,1.17,1.18 GMEOLEData.h,1.7,1.8

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

Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv23427/Gme

Modified Files:
	GMEDoc.cpp GMEOLEData.cpp GMEOLEData.h 
Log Message:
Dumper/Parser changed for closure logic:
	-not to dump relids, childrelidscntrs in case of closure dump
	-libreferred and libderivedfrom (soft) attributes added, if the objects are found upon parsing the reference or instantiation is reproduced
Mga:
	-AbsPath property added for MgaObject: gives back the absolute path to an object
	-get_ObjectByPath search implemented for search based on kindnames


CVS User: zolmol

Index: GMEDoc.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEDoc.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** GMEDoc.cpp	2 Jun 2004 22:32:38 -0000	1.21
--- GMEDoc.cpp	30 Jun 2004 17:50:46 -0000	1.22
***************
*** 147,152 ****
  	CComObjPtr<IMgaFCOs> sel_fcos, top_fcos;
  	CComObjPtr<IMgaFolders> sel_folders, top_folders;
  	COMTHROW( cl.CoCreateInstance(L"Mga.MgaClosure") );
! 	COMTHROW( cl->SelectiveClosure( fcos, 0, PutOut( sel_fcos), PutOut( sel_folders), PutOut( top_fcos), PutOut( top_folders), 0 ));
  
  	if ( sel_fcos || sel_folders) // if both null the operation is not needed (either dumped to file already or unsuccessful)
--- 147,153 ----
  	CComObjPtr<IMgaFCOs> sel_fcos, top_fcos;
  	CComObjPtr<IMgaFolders> sel_folders, top_folders;
+ 	long options;
  	COMTHROW( cl.CoCreateInstance(L"Mga.MgaClosure") );
! 	COMTHROW( cl->SelectiveClosure( fcos, 0, PutOut( sel_fcos), PutOut( sel_folders), PutOut( top_fcos), PutOut( top_folders), 0, &options ));
  
  	if ( sel_fcos || sel_folders) // if both null the operation is not needed (either dumped to file already or unsuccessful)
***************
*** 159,162 ****
--- 160,165 ----
  		if ( top_fcos)		pDataSource->SetTopNodes( top_fcos);
  		if ( top_folders)	pDataSource->SetTopNodes( top_folders);
+ 		
+ 		pDataSource->SetOptions( options);
  
  		CComPtr<IMgaRegNodes> anns; 

Index: GMEOLEData.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEData.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GMEOLEData.cpp	7 Jun 2004 15:33:20 -0000	1.17
--- GMEOLEData.cpp	30 Jun 2004 17:50:46 -0000	1.18
***************
*** 417,423 ****
  
  			if ( is_top_set)
! 				COMTHROW( dumper->DumpClosR( fcos, fols, PutInBstr( filename), top_fcos, top_folds) );
  			else // if top objects are not set dump starting from RootFolder
! 				COMTHROW( dumper->DumpClos( fcos, fols, PutInBstr( filename)) );
  
  			CFile file;
--- 417,423 ----
  
  			if ( is_top_set)
! 				COMTHROW( dumper->DumpClosR( fcos, fols, PutInBstr( filename), top_fcos, top_folds, m_options) );
  			else // if top objects are not set dump starting from RootFolder
! 				COMTHROW( dumper->DumpClos( fcos, fols, PutInBstr( filename), m_options) );
  
  			CFile file;

Index: GMEOLEData.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEData.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GMEOLEData.h	2 Jun 2004 22:32:38 -0000	1.7
--- GMEOLEData.h	30 Jun 2004 17:50:46 -0000	1.8
***************
*** 89,98 ****
  
  protected:
! 	CComPtr<IUnknown> m_topFcos;
! 	CComPtr<IUnknown> m_topFolders;
  
  public:
  	void SetTopNodes(IMgaFCOs *objs) { m_topFcos = objs; }
  	void SetTopNodes(IMgaFolders *objs) { m_topFolders = objs; }
  
  protected:
--- 89,100 ----
  
  protected:
! 	CComPtr<IUnknown>	m_topFcos;
! 	CComPtr<IUnknown>	m_topFolders;
! 	long				m_options;
  
  public:
  	void SetTopNodes(IMgaFCOs *objs) { m_topFcos = objs; }
  	void SetTopNodes(IMgaFolders *objs) { m_topFolders = objs; }
+ 	void SetOptions( long l) { m_options = l; }
  
  protected: