[commit] r2217 - trunk/GME/Parser

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Wed May 29 10:09:45 CDT 2013


Author: ksmyth
Date: Wed May 29 10:09:45 2013
New Revision: 2217

Log:
MgaParser: Ignore status='meta' attributes

Modified:
   trunk/GME/Parser/MgaParser.cpp

Modified: trunk/GME/Parser/MgaParser.cpp
==============================================================================
--- trunk/GME/Parser/MgaParser.cpp	Wed May 29 10:09:28 2013	(r2216)
+++ trunk/GME/Parser/MgaParser.cpp	Wed May 29 10:09:45 2013	(r2217)
@@ -1296,9 +1296,14 @@
 	GetPrevObj(fco);
 
 	CComObjPtr<IMgaMetaAttribute> metaattr;
-	HRESULT hr = resolver->get_AttrByStr(fco, PutInBstrAttr(attributes, _T("kind")), PutOut(metaattr));
+	HRESULT hr;
+	const std::tstring* status = GetByNameX(attributes, _T("status"));
+	if (status && *status == L"meta")
+		;
+	else
+		hr = resolver->get_AttrByStr(fco, PutInBstrAttr(attributes, _T("kind")), PutOut(metaattr));
 
-	if( FAILED(hr) || metaattr == NULL )
+	if (metaattr == NULL || FAILED(hr))
 	{
 		GetCurrent().object = NULL;
 		return;
@@ -1309,7 +1314,7 @@
 	ASSERT( attr != NULL );
 	GetCurrent().object = attr;
 
-	if( GetByNameX(attributes, _T("status")) == NULL )
+	if(status == NULL )
 	{
 		// we set some value, and from the _T("value") element we set the actual value
 


More information about the gme-commit mailing list