[GME-commit] GMESRC/GME/Parser MgaDumper.cpp,1.23,1.24 MgaParser.cpp,1.28,1.29 mga.dtd,1.10,1.11 mgaclosure.dtd,1.1,1.2

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

Update of /project/gme-repository/GMESRC/GME/Parser
In directory escher:/tmp/cvs-serv21986

Modified Files:
	MgaDumper.cpp MgaParser.cpp mga.dtd mgaclosure.dtd 
Log Message:
Regnode status (undefined) restored properly during export-import now.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MgaParser.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/MgaParser.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** MgaParser.cpp	26 Jan 2005 17:30:59 -0000	1.28
--- MgaParser.cpp	13 Apr 2005 00:07:05 -0000	1.29
***************
*** 639,643 ****
  
  		// when we create the registry node, 
! 		// we fill it by an empty string if not inherited
  		if( status == 0 )
  			COMTHROW( regnode->put_Value(PutInBstr(GetCurrData())) );
--- 639,643 ----
  
  		// when we create the registry node, 
! 		// we fill it by an empty string if not inherited or not undefined
  		if( status == 0 )
  			COMTHROW( regnode->put_Value(PutInBstr(GetCurrData())) );

Index: mga.dtd
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/mga.dtd,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mga.dtd	27 Sep 2004 21:33:01 -0000	1.10
--- mga.dtd	13 Apr 2005 00:07:05 -0000	1.11
***************
*** 28,32 ****
  <!ATTLIST regnode
  	name		CDATA		#REQUIRED
! 	status		(inherited|meta) #IMPLIED
  	isopaque	(yes|no)	"no"
  >
--- 28,32 ----
  <!ATTLIST regnode
  	name		CDATA		#REQUIRED
! 	status		(inherited|meta|undefined) #IMPLIED
  	isopaque	(yes|no)	"no"
  >

Index: mgaclosure.dtd
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/mgaclosure.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mgaclosure.dtd	27 Sep 2004 21:33:01 -0000	1.1
--- mgaclosure.dtd	13 Apr 2005 00:07:05 -0000	1.2
***************
*** 28,32 ****
  <!ATTLIST regnode
  	name		CDATA		#REQUIRED
! 	status		(inherited|meta) #IMPLIED
  	isopaque	(yes|no)	"no"
  >
--- 28,32 ----
  <!ATTLIST regnode
  	name		CDATA		#REQUIRED
! 	status		(inherited|meta|undefined) #IMPLIED
  	isopaque	(yes|no)	"no"
  >

Index: MgaDumper.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/MgaDumper.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** MgaDumper.cpp	1 Feb 2005 23:04:08 -0000	1.23
--- MgaDumper.cpp	13 Apr 2005 00:07:05 -0000	1.24
***************
*** 598,601 ****
--- 598,606 ----
  		Attr("isopaque", "yes");
  
+ 	long status;
+ 	COMTHROW( regnode->get_Status( &status ) );
+ 	if( status == -2) // ATTSTATUS_UNDEFINED
+ 		Attr("status", "undefined");
+ 
  	StartElem("value");
  	Data(regnode, IMgaRegNode::get_Value);