[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep Dumper.cpp,1.20,1.21 Dumper.h,1.6,1.7

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

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
In directory braindrain:/tmp/cvs-serv25525/Rep

Modified Files:
	Dumper.cpp Dumper.h 
Log Message:
Making possible invoking in silent mode, supporting relative pathnames.


CVS User: zolmol

Index: Dumper.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Dumper.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Dumper.cpp	30 Jun 2004 17:55:19 -0000	1.20
--- Dumper.cpp	12 Jul 2004 22:01:09 -0000	1.21
***************
*** 1579,1583 ****
  
  
! /*static*/ int Dumper::selectOutputFiles( const std::string& proj_name)
  {
  	try {
--- 1579,1583 ----
  
  
! /*static*/ int Dumper::selectOutputFiles( const std::string& proj_name, const std::string& proj_path)
  {
  	try {
***************
*** 1586,1596 ****
  		CString def_name = global_vars.xmp_file_name.c_str();
  #ifdef NOUSERINPUT
! 		global_vars.xmp_file_name = "c:\\temp\\" + global_vars.xmp_file_name;
! 		global_vars.err_file_name = "c:\\temp\\" + global_vars.err_file_name;
  #else
  		if( global_vars.silent_mode)
  		{
! 			global_vars.xmp_file_name = "c:\\temp\\" + global_vars.xmp_file_name;
! 			global_vars.err_file_name = "c:\\temp\\" + global_vars.err_file_name;
  		}
  		else
--- 1586,1614 ----
  		CString def_name = global_vars.xmp_file_name.c_str();
  #ifdef NOUSERINPUT
! 		global_vars.xmp_file_name = proj_path + proj_name + ".xmp";
! 		try {
! 			CFile f( global_vars.xmp_file_name.c_str(), CFile::modeCreate);
! 			global_vars.xmp_file_name = f.GetFilePath();
! 			f.Close();
! 			CFile::Remove( global_vars.xmp_file_name.c_str());
! 		}
! 		catch(...) {
! 			global_vars.xmp_file_name = proj_path + proj_name + ".xmp";
! 		}
! 		global_vars.err_file_name = global_vars.xmp_file_name + ".log";
  #else
  		if( global_vars.silent_mode)
  		{
! 			global_vars.xmp_file_name = proj_path + proj_name + ".xmp";
! 			try {
! 				CFile f( global_vars.xmp_file_name.c_str(), CFile::modeCreate);
! 				global_vars.xmp_file_name = f.GetFilePath();
! 				f.Close();
! 				CFile::Remove( global_vars.xmp_file_name.c_str());
! 			}
! 			catch(...) {
! 				global_vars.xmp_file_name = proj_path + proj_name + ".xmp";
! 			}
! 			global_vars.err_file_name = global_vars.xmp_file_name + ".log";
  		}
  		else

Index: Dumper.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Dumper.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Dumper.h	26 Apr 2004 17:13:38 -0000	1.6
--- Dumper.h	12 Jul 2004 22:01:09 -0000	1.7
***************
*** 19,23 ****
  
  
! 	static int selectOutputFiles( const std::string& proj_name);
  	static void registerIt( const std::string& f_name);
  	static bool doParseCardinality
--- 19,23 ----
  
  
! 	static int selectOutputFiles( const std::string& proj_name, const std::string& project_path);
  	static void registerIt( const std::string& f_name);
  	static bool doParseCardinality