[GME-commit] GMESRC/GME/XmlBackEnd CoreXmlFile.cpp,1.33,1.34

Log messages of CVS commits gme-commit at list.isis.vanderbilt.edu
Thu Feb 21 12:49:17 CST 2008


Update of /project/gme-repository/GMESRC/GME/XmlBackEnd
In directory escher:/tmp/cvs-serv24453

Modified Files:
	CoreXmlFile.cpp 
Log Message:
Avoiding an error message when looking for project.mgx.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: CoreXmlFile.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/CoreXmlFile.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** CoreXmlFile.cpp	21 Feb 2008 18:16:58 -0000	1.33
--- CoreXmlFile.cpp	21 Feb 2008 18:49:15 -0000	1.34
***************
*** 3227,3241 ****
  	parser->setErrorHandler( err_handler);
  
! 	//XERCES_CPP_NAMESPACE::DOMDocument * doc = parser->parseURI( m_projectFileName.c_str() );
! 	//if( doc == NULL )
! 	bool          suc;
! 	XERCES_CPP_NAMESPACE::DOMDocument * doc = enclosedParse( m_projectFileName, parser, &suc);
  	if( !doc || !suc)
  	{
  		//sendMsg( "Could not find or parse project file " + m_projectFileName, MSG_ERROR);
- 		WIN32_FILE_ATTRIBUTE_DATA attr;
- 		bool fexists = GetFileAttributesEx( m_projectFileName.c_str(), GetFileExInfoStandard, &attr );
  		setFileNames( true); // reset the file name to a newly found one
- 		//doc = parser->parseURI( m_projectFileName.c_str() );
  		doc = enclosedParse( m_projectFileName, parser, &suc);
  		if( !doc || !suc)
--- 3227,3238 ----
  	parser->setErrorHandler( err_handler);
  
! 	bool fexists   = FileHelp::fileExist( m_projectFileName);
! 	bool suc       = false;
! 	XERCES_CPP_NAMESPACE::DOMDocument * doc = 0;
! 	if( fexists) doc = enclosedParse( m_projectFileName, parser, &suc);
  	if( !doc || !suc)
  	{
  		//sendMsg( "Could not find or parse project file " + m_projectFileName, MSG_ERROR);
  		setFileNames( true); // reset the file name to a newly found one
  		doc = enclosedParse( m_projectFileName, parser, &suc);
  		if( !doc || !suc)



More information about the GME-commit mailing list