[GME-commit] GMESRC/GME/XmlBackEnd CoreXmlFile.cpp, 1.28, 1.29 CoreXmlFile.h, 1.12, 1.13

[Log messages of CVS commits]

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

Modified Files:
	CoreXmlFile.cpp CoreXmlFile.h 
Log Message:
-xmga.dtd not used anymore with xerces2.7.
-sub_update catches exceptions (thrown by SERF when a file is locked already)


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: CoreXmlFile.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/CoreXmlFile.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** CoreXmlFile.cpp	18 Feb 2008 20:13:56 -0000	1.28
--- CoreXmlFile.cpp	19 Feb 2008 19:20:54 -0000	1.29
***************
*** 126,153 ****
  
  /*static*/ const char * CCoreXmlFile::m_contentConst = "contents";
! /*static*/ const char * CCoreXmlFile::m_dtdFileContent = "\
! <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
! <!ENTITY lt     \"&#38;#60;\"> \n\
! <!ENTITY gt     \"&#62;\"> \n\
! <!ENTITY amp    \"&#38;#38;\"> \n\
! <!ENTITY apos   \"&#39;\"> \n\
! <!ENTITY quot   \"&#34;\">\n\
! <!ELEMENT Root EMPTY>\n\
! <!ATTLIST Root\n\
! 	MetaId		CDATA		#IMPLIED\n\
! 	Id		CDATA		#IMPLIED\n\
! 	Name		CDATA		#IMPLIED\n\
! 	CDate		CDATA		#IMPLIED\n\
! 	MDate		CDATA		#IMPLIED\n\
! 	Author		CDATA		#IMPLIED\n\
! 	GUID		CDATA		#IMPLIED\n\
! 	VERSION		CDATA		#IMPLIED\n\
! 	ParadigmGUID		CDATA		#IMPLIED\n\
! 	ParadigmVersion		CDATA		#IMPLIED\n\
! 	ExtParadigm		CDATA		#IMPLIED\n\
! 	Comment		CDATA		#IMPLIED\n\
! 	MGA_Version	CDATA		#IMPLIED\n\
! >\n\
! ";
  
  bool XmlObjComp::operator()( XmlObject * p1, XmlObject * p2) const
--- 126,153 ----
  
  /*static*/ const char * CCoreXmlFile::m_contentConst = "contents";
! ///*static*/ const char * CCoreXmlFile::m_dtdFileContent = "\
! //<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
! //<!ENTITY lt     \"&#38;#60;\"> \n\
! //<!ENTITY gt     \"&#62;\"> \n\
! //<!ENTITY amp    \"&#38;#38;\"> \n\
! //<!ENTITY apos   \"&#39;\"> \n\
! //<!ENTITY quot   \"&#34;\">\n\
! //<!ELEMENT Root EMPTY>\n\
! //<!ATTLIST Root\n\
! //	MetaId		CDATA		#IMPLIED\n\
! //	Id		CDATA		#IMPLIED\n\
! //	Name		CDATA		#IMPLIED\n\
! //	CDate		CDATA		#IMPLIED\n\
! //	MDate		CDATA		#IMPLIED\n\
! //	Author		CDATA		#IMPLIED\n\
! //	GUID		CDATA		#IMPLIED\n\
! //	VERSION		CDATA		#IMPLIED\n\
! //	ParadigmGUID		CDATA		#IMPLIED\n\
! //	ParadigmVersion		CDATA		#IMPLIED\n\
! //	ExtParadigm		CDATA		#IMPLIED\n\
! //	Comment		CDATA		#IMPLIED\n\
! //	MGA_Version	CDATA		#IMPLIED\n\
! //>\n\
! //";
  
  bool XmlObjComp::operator()( XmlObject * p1, XmlObject * p2) const
***************
*** 3235,3239 ****
  
  
! 	makeSureFileExistsInVerSys( "xmga.dtd", m_dtdFileContent);
  }
  
--- 3235,3239 ----
  
  
! 	//makeSureFileExistsInVerSys( "xmga.dtd", m_dtdFileContent);
  }
  
***************
*** 3501,3506 ****
  
  	bool spec_root = metaToken == "Root"; // or: m_metaid==METAID_ROOT
! 	if( spec_root) // <!DOCTYPE Root SYSTEM "my.dtd">
! 		ofs << "<!DOCTYPE Root SYSTEM \"xmga.dtd\">\n";
  
  	// the multiline case? for details see Mga\MgaGeneric.cpp
--- 3501,3506 ----
  
  	bool spec_root = metaToken == "Root"; // or: m_metaid==METAID_ROOT
! 	//if( spec_root) // <!DOCTYPE Root SYSTEM "my.dtd">
! 	//	ofs << "<!DOCTYPE Root SYSTEM \"xmga.dtd\">\n";
  
  	// the multiline case? for details see Mga\MgaGeneric.cpp

Index: CoreXmlFile.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/CoreXmlFile.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CoreXmlFile.h	18 Feb 2008 20:13:56 -0000	1.12
--- CoreXmlFile.h	19 Feb 2008 19:20:54 -0000	1.13
***************
*** 807,811 ****
  	std::string                     m_contentPath;
  	static const char *             m_contentConst;
! 	static const char *             m_dtdFileContent;
  	std::string                     m_cacheFileName;
  	std::string                     m_projectFileName;
--- 807,811 ----
  	std::string                     m_contentPath;
  	static const char *             m_contentConst;
! 	//static const char *           m_dtdFileContent;//obsolete?
  	std::string                     m_cacheFileName;
  	std::string                     m_projectFileName;