[GME-commit] GMESRC/GME/XmlBackEnd CoreXmlFile.cpp,1.22,1.23

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

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

Modified Files:
	CoreXmlFile.cpp 
Log Message:
Create xmga.dtd file also when the project is not under source control.




CVS User: Zoltan Molnar, ISIS (zolmol)

Index: CoreXmlFile.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/CoreXmlFile.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CoreXmlFile.cpp	27 Sep 2007 12:22:45 -0000	1.22
--- CoreXmlFile.cpp	27 Sep 2007 13:23:32 -0000	1.23
***************
*** 799,803 ****
  			}
  
! 			AfxMessageBox( res.c_str(), MB_ICONINFORMATION);
  		}
  	}
--- 799,806 ----
  			}
  
! 			if( lus.size() > 0)
! 				AfxMessageBox( res.c_str(), MB_ICONINFORMATION);
! 			else
! 				AfxMessageBox( "No user login info found!");
  		}
  	}
***************
*** 4778,4782 ****
  {
  	std::string fulllocalfname = m_folderPath + "\\" + p_fname;
! 	bool found = true;
  
  	try
--- 4781,4785 ----
  {
  	std::string fulllocalfname = m_folderPath + "\\" + p_fname;
! 	bool found = false;
  
  	try
***************
*** 4791,4794 ****
--- 4794,4798 ----
  			try {
  				checkOutFileCC( fulllocalfname.c_str());
+ 				found = true;
  			} catch(...) {
  				found = false;
***************
*** 5190,5199 ****
  	if( isSS())
  	{
! 		string user; bool newfile = false;
  		getSSCheckOutUser( container, user, newfile );
  		if( user.empty())
! 			user = "The object selected is not checked out.";
  		else
! 			user = "The object selected is checked out by \"" + user + "\"";
  		AfxMessageBox( user.c_str(), MB_ICONINFORMATION);
  		//bool ismodbyothers = fileModifiedByOthers( container);
--- 5194,5208 ----
  	if( isSS())
  	{
! 		string user, nm; bool newfile = false;
  		getSSCheckOutUser( container, user, newfile );
+ 		AttribMapIter itnm = container->m_attributes.find( ATTRID_NAME);
+ 		if( itnm != container->m_attributes.end()) 
+ 			itnm->second->toString( nm);
+ 		//nm = makelink( container);
+ 
  		if( user.empty())
! 			user = "Container \"" + nm + "\" is not checked out.";
  		else
! 			user = "Container \"" + nm + "\" is checked out by \"" + user + "\"";
  		AfxMessageBox( user.c_str(), MB_ICONINFORMATION);
  		//bool ismodbyothers = fileModifiedByOthers( container);
***************
*** 5203,5206 ****
--- 5212,5217 ----
  		ASSERT(0);
  	}
+ 	else 
+ 		AfxMessageBox( "Container is not checked out since the project is not under sourcecontrol.");
  }