[GME-commit] GMESRC/GME/Parser MetaParser.cpp,1.24,1.25 edf.dtd,1.9,1.10

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

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

Modified Files:
	MetaParser.cpp edf.dtd 
Log Message:
Attributes might be hidden by 'viewable = "no"' in XMP file (optional).
DTD and metaparser altered. Default to viewable='yes'


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MetaParser.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/MetaParser.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** MetaParser.cpp	21 Jul 2006 16:50:51 -0000	1.24
--- MetaParser.cpp	19 Oct 2006 14:48:07 -0000	1.25
***************
*** 689,692 ****
--- 689,694 ----
  	ASSERT( attr != NULL );
  	GetCurrent().object = attr;
+ 	
+ 	attr->put_Viewable( VARIANT_TRUE); // default behaviour if no 'viewable' attribute is found
  
  	attributes_iterator i = attributes.begin();
***************
*** 719,722 ****
--- 721,727 ----
  			COMTHROW( attr->put_ValueType(attval) );
  		}
+ 
+ 		if( i->first == "viewable" && i->second == "no")
+ 			attr->put_Viewable( VARIANT_FALSE);
  
  		++i;

Index: edf.dtd
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/edf.dtd,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** edf.dtd	21 Jul 2006 16:50:51 -0000	1.9
--- edf.dtd	19 Oct 2006 14:48:07 -0000	1.10
***************
*** 89,92 ****
--- 89,93 ----
  	metaref		CDATA		#IMPLIED
  	name		NMTOKEN		#REQUIRED
+ 	viewable	CDATA		#IMPLIED
  	defvalue	CDATA		#IMPLIED
  	valuetype	(integer|double|boolean|string|enum|dynamic)	"string"