[GME-commit] GMESRC/GME/Parser MetaParser.cpp,1.21,1.22 MetaParser.h,1.4,1.5

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

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

Modified Files:
	MetaParser.cpp MetaParser.h 
Log Message:
Version based paradigm registration

CVS User: volgy

Index: MetaParser.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MetaParser.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MetaParser.cpp	20 Jul 2004 13:55:47 -0000	1.21
--- MetaParser.cpp	20 Jul 2004 16:01:39 -0000	1.22
***************
*** 40,43 ****
--- 40,44 ----
  
  			foundconstraints = false;
+ 			explicitguid = false;
  			{
  				SAXParser parser;
***************
*** 61,67 ****
  				parser.parse(xmlfile.c_str());
  			}
! 			{
! 
! 				/* Old pradigm guid logic
  //calculate checksum:
  				int sum = 0, cyc = 0;
--- 62,67 ----
  				parser.parse(xmlfile.c_str());
  			}
! 			if (!explicitguid) {
! 				// Old pradigm guid logic
  //calculate checksum:
  				int sum = 0, cyc = 0;
***************
*** 87,91 ****
  	
  				COMTHROW( metaproject->put_GUID(v) );
- 				*/
  			}
  		}
--- 87,90 ----
***************
*** 211,214 ****
--- 210,214 ----
  
  			COMTHROW( metaproject->put_GUID(v) );
+ 			explicitguid = true;
  		}
  

Index: MetaParser.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MetaParser.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MetaParser.h	26 Jul 2001 19:36:00 -0000	1.4
--- MetaParser.h	20 Jul 2004 16:01:39 -0000	1.5
***************
*** 21,24 ****
--- 21,25 ----
  {
  	bool foundconstraints;
+ 	bool explicitguid;
  public:
  	CMetaParser();