[GME-commit] GMESRC/GME/Interfaces InterfaceVersion.h,1.50,1.51 Mga.idl,1.42,1.43 MgaUtil.idl,1.38,1.39 Parser.idl,1.10,1.11

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

Update of /var/lib/gme/GMESRC/GME/Interfaces
In directory braindrain:/tmp/cvs-serv14087

Modified Files:
	InterfaceVersion.h Mga.idl MgaUtil.idl Parser.idl 
Log Message:
Mga: NthObjectByPath propgetter added
Parser, MgaUtil: smartcopy methods added.



CVS User: zolmol

Index: InterfaceVersion.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Interfaces/InterfaceVersion.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** InterfaceVersion.h	25 Aug 2004 20:36:32 -0000	1.50
--- InterfaceVersion.h	27 Sep 2004 22:06:24 -0000	1.51
***************
*** 5,13 ****
  // CHECKSUM Core.idl = 690DFF65
  // CHECKSUM Meta.idl = 303D0EE0
! // CHECKSUM Mga.idl = 29EA1066
! // CHECKSUM MgaUtil.idl = F6C1D690
  // CHECKSUM MgaDecorator.idl = E2851BB1
  // CHECKSUM Gme.idl = E6F42777
! // CHECKSUM Parser.idl = FF461681
  
  
--- 5,13 ----
  // CHECKSUM Core.idl = 690DFF65
  // CHECKSUM Meta.idl = 303D0EE0
! // CHECKSUM Mga.idl = 2CCFC3FB
! // CHECKSUM MgaUtil.idl = 479B53BA
  // CHECKSUM MgaDecorator.idl = E2851BB1
  // CHECKSUM Gme.idl = E6F42777
! // CHECKSUM Parser.idl = BE7EFA2E
  
  
***************
*** 18,22 ****
  //  -- never decrease it
  cpp_quote("#ifndef INTERFACE_VERSION")
! cpp_quote("#define INTERFACE_VERSION 0x00020049")
  cpp_quote("#endif //INTERFACE_VERSION")
! #define INTERFACE_VERSION 0x00020049
--- 18,22 ----
  //  -- never decrease it
  cpp_quote("#ifndef INTERFACE_VERSION")
! cpp_quote("#define INTERFACE_VERSION 0x00020057")
  cpp_quote("#endif //INTERFACE_VERSION")
! #define INTERFACE_VERSION 0x00020057

Index: Mga.idl
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Interfaces/Mga.idl,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Mga.idl	20 Jul 2004 16:01:39 -0000	1.42
--- Mga.idl	27 Sep 2004 22:06:24 -0000	1.43
***************
*** 461,464 ****
--- 461,466 ----
  	[ propget, helpstring("property ObjectByPath: path may contain /@names or /RelID-s")] 
  			HRESULT ObjectByPath([in] BSTR path, [out, retval] IMgaObject **pVal);
+ 	[ propget, helpstring("property nthObjectByPath, returns the nth samename object if path not unique")] 
+ 			HRESULT NthObjectByPath([in] long n_th, [in] BSTR path, [out, retval] IMgaObject **pVal);
  
  // Project properties
***************
*** 709,712 ****
--- 711,716 ----
  	[ propget, helpstring("property ObjectByPath: path may contain /@names or /RelID-s")] 
  			HRESULT ObjectByPath([in] BSTR path, [out, retval] IMgaObject **pVal);
+ 	[ propget, helpstring("property nthObjectByPath, returns the nth samename object if path not unique")] 
+ 			HRESULT NthObjectByPath([in] long n_th, [in] BSTR path, [out, retval] IMgaObject **pVal);
  };
  

Index: MgaUtil.idl
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Interfaces/MgaUtil.idl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** MgaUtil.idl	25 Aug 2004 20:36:32 -0000	1.38
--- MgaUtil.idl	27 Sep 2004 22:06:24 -0000	1.39
***************
*** 183,193 ****
  	HRESULT ExternalEditor([in] regaccessmode_enum mode, [in] BSTR path);
  
- 	// --- AutoRouter
- 	[propget, helpstring("property LabelAvoidance")]
- 	HRESULT LabelAvoidance([in] regaccessmode_enum mode, [out, retval] VARIANT_BOOL *enabled);
- 
- 	[propput, helpstring("property LabelAvoidance")]
- 	HRESULT LabelAvoidance([in] regaccessmode_enum mode, [in] VARIANT_BOOL enabled);
- 
  	// --- Paradigms
  
--- 183,186 ----
***************
*** 432,440 ****
  	[helpstring("method SelectiveClosure")]
  	HRESULT SelectiveClosure( 
! 		[in] IMgaFCOs *init_sel_fcos, [in] IMgaFolders *init_sel_folders, 
! 		[out] IMgaFCOs **sel_fcos, [out] IMgaFolders **sel_folders, 
! 		[out] IMgaFCOs **root_fcos, [out] IMgaFolders **root_folders,  
! 		[in] int folder_containment, [out] long * options);
  
  };
  
--- 425,446 ----
  	[helpstring("method SelectiveClosure")]
  	HRESULT SelectiveClosure( 
! 		[in] IMgaFCOs *init_sel_fcos, [in] IMgaFolders *init_sel_folders,
! 		[out] IMgaFCOs **sel_fcos, [out] IMgaFolders **sel_folders,
! 		[out] IMgaFCOs **top_fcos, [out] IMgaFolders **top_folders,
! 		[in] int folder_containment,
! 		[out] long * options,
! 		[out] BSTR *acckinds);
! 
  
+ 	[helpstring("method SmartCopy")]
+ 	HRESULT SmartCopy(
+ 		[in] IMgaFCOs *init_sel_fcos, [in] IMgaFolders *init_sel_folders,
+ 		[out] IMgaFCOs **sel_fcos,  [out] IMgaFolders **sel_folders,
+ 		[out] IMgaFCOs **top_fcos, [out] IMgaFolders **top_folders,
+ 		[in] int folder_containment,
+ 		[out] long * options,
+ 		[out] BSTR *acckinds,
+ 		[out] BSTR *path
+ 		);
  };
  

Index: Parser.idl
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Interfaces/Parser.idl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Parser.idl	19 Jul 2004 07:01:00 -0000	1.10
--- Parser.idl	27 Sep 2004 22:06:24 -0000	1.11
***************
*** 43,51 ****
  
  	[helpstring("method DumpClos")]
! 	HRESULT DumpClos( [in] IMgaFCOs *fc, [in] IMgaFolders *f, [in] BSTR xmlfile, [in] int libr_stub);
  
! 	[helpstring("method DumpClos with root objects specified")]
! 	HRESULT DumpClosR( [in] IMgaFCOs *fc, [in] IMgaFolders *f, [in] BSTR xmlfile,
! 						[in] IMgaFCOs *rfc, [in] IMgaFolders *rf, [in] int libr_stub);
  
  	[propput, helpstring("property FormatVersion")]
--- 43,51 ----
  
  	[helpstring("method DumpClos")]
! 	HRESULT DumpClos( [in] IMgaFCOs *fco, [in] IMgaFolders *fld, [in] BSTR xmlfile, [in] int libr_stub);
  
! 	[helpstring("method DumpClos with top objects specified")]
! 	HRESULT DumpClosR(  [in] IMgaFCOs *fco, [in] IMgaFolders *fld, [in] BSTR xmlfile,
! 						[in] IMgaFCOs *topfco, [in] IMgaFolders *topfld, [in] int options, [in] BSTR abspath, [in] BSTR acceptingkinds);
  
  	[propput, helpstring("property FormatVersion")]
***************
*** 70,73 ****
--- 70,83 ----
  	[helpstring("method ParseFCO")]
  	HRESULT ParseFCOs([in] IMgaObject *here, [in] BSTR xmlfile);
+ 
+ 	[helpstring("method GetClipXMLInfo")]
+ 	HRESULT GetClipXMLInfo([in] BSTR xmlfile, [in] IMgaObject *target, [out] VARIANT_BOOL *parguid, [out] BSTR *acckind, [out] BSTR *ver);
+ 
+ 	[helpstring("method ParseCLOSURE version 1 - basic")]
+ 	HRESULT ParseClos1([in] IMgaObject *here, [in] BSTR xmlfile);
+ 
+ 	[helpstring("method ParseCLOSURE version 4 - smart")]
+ 	HRESULT ParseClos4([in] IMgaObject *here, [in] BSTR xmlfile);
+ 
  };